# HG changeset patch # User William Pitcock # Date 1193487992 18000 # Node ID 3aa95f65c24defe446c4a5d4a55887dd6ceed854 # Parent c162b6a0f11f9a5e644204cc28b7d39694a340ca# Parent 902540201c0d410037d855f3e7e9edc4273b27ff Automated merge with ssh://hg.atheme.org//hg/audacious-plugins diff -r c162b6a0f11f -r 3aa95f65c24d configure.ac --- a/configure.ac Sat Oct 27 07:25:40 2007 -0500 +++ b/configure.ac Sat Oct 27 07:26:32 2007 -0500 @@ -367,24 +367,18 @@ ) if test "$enable_mp3" = "yes"; then - AC_CHECK_LIB(mad, mad_timer_add, - [INPUT_PLUGINS="$INPUT_PLUGINS madplug" - MAD_CFLAGS="" - MAD_LIBS="-lmad -lm"], - [PKG_CHECK_MODULES(MAD, [libmad], - [INPUT_PLUGINS="$INPUT_PLUGINS madplug"], - [enable_mp3="no"]) - ]) + AM_PATH_LIBMAD([enable_mp3=yes], + [AC_MSG_WARN([*** Cannot find libmad, mp3 plugin will not be built ***]) + enable_mp3=no] + ) +else + AC_MSG_RESULT([*** mp3 plugin disabled per user request ***]) + enable_mp3=no fi -# XXX rtsp support -# PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0], -# [LIBNMS_SRC=rtsp.c -# AC_DEFINE(HAVE_NEMESI,,[Define if rtp/rtsp support is available]) -# ],[LIBNMS_SRC=""]) -# AC_SUBST(LIBNMS_CFLAGS) -# AC_SUBST(LIBNMS_LIBS) -# AC_SUBST(LIBNMS_SRC) -# fi + +if test "$enable_mp3" = "yes"; then + INPUT_PLUGINS="$INPUT_PLUGINS madplug" +fi AC_SUBST(MAD_CFLAGS) AC_SUBST(MAD_LIBS) diff -r c162b6a0f11f -r 3aa95f65c24d m4/libFLAC.m4 --- a/m4/libFLAC.m4 Sat Oct 27 07:25:40 2007 -0500 +++ b/m4/libFLAC.m4 Sat Oct 27 07:26:32 2007 -0500 @@ -28,7 +28,7 @@ LIBFLAC_CFLAGS="-I$libFLAC_includes" elif test "x$libFLAC_prefix" != "x" ; then LIBFLAC_CFLAGS="-I$libFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then + elif test "x$prefix" != "xNONE"; then LIBFLAC_CFLAGS="-I$prefix/include" fi diff -r c162b6a0f11f -r 3aa95f65c24d m4/libmad.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/m4/libmad.m4 Sat Oct 27 07:26:32 2007 -0500 @@ -0,0 +1,104 @@ +dnl Configure paths for libmad +dnl derived from libFLAC.m4 + +dnl AM_PATH_LIBMAD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libmad, and define MAD_CFLAGS and MAD_LIBS +dnl +AC_DEFUN([AM_PATH_LIBMAD], +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(libmad,[ --with-libmad=PFX Prefix where libmad is installed (optional)], libmad_prefix="$withval", libmad_prefix="") +AC_ARG_WITH(libmad-libraries,[ --with-libmad-libraries=DIR Directory where libmad library is installed (optional)], libmad_libraries="$withval", libmad_libraries="") +AC_ARG_WITH(libmad-includes,[ --with-libmad-includes=DIR Directory where libmad header files are installed (optional)], libmad_includes="$withval", libmad_includes="") +AC_ARG_ENABLE(libmadtest, [ --disable-libmadtest do not try to compile and run a test libmad program],, enable_libmadtest=yes) + + if test "x$libmad_libraries" != "x" ; then + MAD_LIBS="-L$libmad_libraries" + elif test "x$libmad_prefix" != "x" ; then + MAD_LIBS="-L$libmad_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + MAD_LIBS="-L$libdir" + fi + + MAD_LIBS="$MAD_LIBS -lmad -lm" + + if test "x$libmad_includes" != "x" ; then + MAD_CFLAGS="-I$libmad_includes" + elif test "x$libmad_prefix" != "x" ; then + MAD_CFLAGS="-I$libmad_prefix/include" + elif test "x$prefix" != "xNONE"; then + MAD_CFLAGS="-I$prefix/include" + fi + + no_libmad="" + + + if test "x$enable_libmadtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $MAD_CFLAGS" + CXXFLAGS="$CXXFLAGS $MAD_CFLAGS" + LIBS="$LIBS $MAD_LIBS" +dnl +dnl Now check if the installed libmad is sufficiently new. +dnl + rm -f conf.libmadtest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + mad_timer_t t; + mad_timer_add(&t, t); + system("touch conf.libmadtest"); + return 0; +} + +],, no_libmad=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libmad" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.libmadtest ; then + : + else + echo "*** Could not run libmad test program, checking why..." + CFLAGS="$CFLAGS $MAD_CFLAGS" + LIBS="$LIBS $MAD_LIBS" + AC_TRY_LINK([ +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libmad or finding the wrong" + echo "*** version of libmad. If it is not finding libmad, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libmad was incorrectly installed" + echo "*** or that you have moved libmad since it was installed. In the latter case, you" + echo "*** may want to edit the libmad-config script: $LIBMAD_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + MAD_CFLAGS="" + MAD_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(MAD_CFLAGS) + AC_SUBST(MAD_LIBS) + rm -f conf.libmadtest +]) diff -r c162b6a0f11f -r 3aa95f65c24d po/de.po --- a/po/de.po Sat Oct 27 07:25:40 2007 -0500 +++ b/po/de.po Sat Oct 27 07:26:32 2007 -0500 @@ -3,7 +3,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2007-10-18 21:38+0200\n" -"PO-Revision-Date: 2007-10-17 16:10+0100\n" +"PO-Revision-Date: 2007-10-23 17:35+0100\n" "Last-Translator: Michael Färber <0102@gmx.at>\n" "Language-Team: german <0102@gmx.at>\n" "MIME-Version: 1.0\n" @@ -29,27 +29,55 @@ msgid "About MP4 AAC player plugin" msgstr "Über MP4-AAC-Player-Plugin" -#: src/aac/libmp4.c:292 src/adplug/adplug-xmms.cc:180 -#: src/adplug/adplug-xmms.cc:263 src/adplug/adplug-xmms.cc:524 -#: src/alac/plugin.c:77 src/arts/arts.c:26 src/arts/configure.c:90 +#: src/aac/libmp4.c:292 +#: src/adplug/adplug-xmms.cc:180 +#: src/adplug/adplug-xmms.cc:263 +#: src/adplug/adplug-xmms.cc:524 +#: src/alac/plugin.c:77 +#: src/arts/arts.c:26 +#: src/arts/configure.c:90 #: src/audiocompress/audacious-glue.c:102 -#: src/audiocompress/audacious-glue.c:552 src/cdaudio-ng/configure.c:206 -#: src/console/Audacious_Driver.cxx:449 src/echo_plugin/gui.c:26 -#: src/echo_plugin/gui.c:137 src/esd/about.c:49 -#: src/filewriter/filewriter.c:178 src/jack/configure.c:141 -#: src/jack/jack.c:539 src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236 -#: src/madplug/plugin.c:596 src/madplug/plugin.c:619 -#: src/metronom/metronom.c:88 src/modplug/gui/main.cxx:46 -#: src/musepack/libmpc.cxx:232 src/null/null.c:67 src/null/null.c:110 -#: src/OSS4/about.c:59 src/OSS/about.c:54 src/paranormal-ng/plugin.c:283 -#: src/paranormal/plugin.c:300 src/scrobbler/gtkstuff.c:25 -#: src/statusicon/si_ui.c:577 src/stereo_plugin/stereo.c:53 -#: src/stereo_plugin/stereo.c:116 src/sun/about.c:38 src/sun/configure.c:559 -#: src/timidity/interface.c:222 src/timidity/xmms-timidity.c:117 -#: src/tonegen/tonegen.c:62 src/tta/libtta.c:151 src/tta/libtta.c:265 -#: src/tta/libtta.c:400 src/vorbis/fileinfo.c:209 src/vorbis/vorbis.c:863 -#: src/vtx/about.c:31 src/vtx/info.c:43 src/wavpack/ui.cxx:56 -#: src/wavpack/ui.cxx:554 src/wav/wav-sndfile.c:543 +#: src/audiocompress/audacious-glue.c:552 +#: src/cdaudio-ng/configure.c:206 +#: src/console/Audacious_Driver.cxx:449 +#: src/echo_plugin/gui.c:26 +#: src/echo_plugin/gui.c:137 +#: src/esd/about.c:49 +#: src/filewriter/filewriter.c:178 +#: src/jack/configure.c:141 +#: src/jack/jack.c:539 +#: src/madplug/fileinfo.c:158 +#: src/madplug/fileinfo.c:236 +#: src/madplug/plugin.c:596 +#: src/madplug/plugin.c:619 +#: src/metronom/metronom.c:88 +#: src/modplug/gui/main.cxx:46 +#: src/musepack/libmpc.cxx:232 +#: src/null/null.c:67 +#: src/null/null.c:110 +#: src/OSS4/about.c:59 +#: src/OSS/about.c:54 +#: src/paranormal-ng/plugin.c:283 +#: src/paranormal/plugin.c:300 +#: src/scrobbler/gtkstuff.c:25 +#: src/statusicon/si_ui.c:577 +#: src/stereo_plugin/stereo.c:53 +#: src/stereo_plugin/stereo.c:116 +#: src/sun/about.c:38 +#: src/sun/configure.c:559 +#: src/timidity/interface.c:222 +#: src/timidity/xmms-timidity.c:117 +#: src/tonegen/tonegen.c:62 +#: src/tta/libtta.c:151 +#: src/tta/libtta.c:265 +#: src/tta/libtta.c:400 +#: src/vorbis/fileinfo.c:209 +#: src/vorbis/vorbis.c:863 +#: src/vtx/about.c:31 +#: src/vtx/info.c:43 +#: src/wavpack/ui.cxx:56 +#: src/wavpack/ui.cxx:554 +#: src/wav/wav-sndfile.c:543 msgid "Ok" msgstr "OK" @@ -65,40 +93,51 @@ "This plugin is released under the terms and conditions of the GNU LGPL.\n" "See http://www.gnu.org/licenses/lgpl.html for details.\n" "\n" -"This plugin uses the AdPlug library, which is copyright (C) Simon Peter, et " -"al.\n" +"This plugin uses the AdPlug library, which is copyright (C) Simon Peter, et al.\n" "Linked AdPlug library version: " msgstr "" "\n" "Copyright (C) 2002, 2003 Simon Peter \n" "\n" -"Dieses Plugin wurde veröffentlicht unter den Bedingungen und Auflagen der " -"GNU LGPL.\n" +"Dieses Plugin wurde veröffentlicht unter den Bedingungen und Auflagen der GNU LGPL.\n" "http://www.gnu.org/licenses/lgpl.html für Details.\n" "\n" -"Dieses Plugin benützt die AdPlug-Bibliothek; diese ist copyright (C) Simon " -"Peter, et al.\n" +"Dieses Plugin benützt die AdPlug-Bibliothek; diese ist copyright (C) Simon Peter, et al.\n" "Gelinkte AdPlug-Bibliotheks-Version: " #: src/adplug/adplug-xmms.cc:254 msgid "AdPlug :: Configuration" msgstr "AdPlug :: Konfiguration" -#: src/adplug/adplug-xmms.cc:273 src/alarm/interface.c:1398 -#: src/alsa/configure.c:389 src/arts/configure.c:91 -#: src/audiocompress/audacious-glue.c:557 src/cdaudio-ng/configure.c:210 -#: src/echo_plugin/gui.c:145 src/jack/configure.c:148 -#: src/modplug/gui/interface.cxx:704 src/modplug/gui/modplug.glade:1648 -#: src/musepack/libmpc.cxx:237 src/musepack/libmpc.cxx:557 src/null/null.c:111 -#: src/sid/xmms-sid.glade:3080 src/sid/xs_interface.c:1250 -#: src/stereo_plugin/stereo.c:125 src/sun/configure.c:567 -#: src/timidity/interface.c:230 src/wavpack/ui.cxx:278 src/wavpack/ui.cxx:561 +#: src/adplug/adplug-xmms.cc:273 +#: src/alarm/interface.c:1398 +#: src/alsa/configure.c:389 +#: src/arts/configure.c:91 +#: src/audiocompress/audacious-glue.c:557 +#: src/cdaudio-ng/configure.c:210 +#: src/echo_plugin/gui.c:145 +#: src/jack/configure.c:148 +#: src/modplug/gui/interface.cxx:704 +#: src/modplug/gui/modplug.glade:1648 +#: src/musepack/libmpc.cxx:237 +#: src/musepack/libmpc.cxx:557 +#: src/null/null.c:111 +#: src/sid/xmms-sid.glade:3080 +#: src/sid/xs_interface.c:1250 +#: src/stereo_plugin/stereo.c:125 +#: src/sun/configure.c:567 +#: src/timidity/interface.c:230 +#: src/wavpack/ui.cxx:278 +#: src/wavpack/ui.cxx:561 msgid "Cancel" msgstr "Abbrechen" -#: src/adplug/adplug-xmms.cc:289 src/console/Audacious_Config.cxx:145 -#: src/madplug/configure.c:191 src/modplug/gui/interface.cxx:618 -#: src/modplug/gui/interface.cxx:876 src/modplug/gui/modplug.glade:1384 +#: src/adplug/adplug-xmms.cc:289 +#: src/console/Audacious_Config.cxx:145 +#: src/madplug/configure.c:191 +#: src/modplug/gui/interface.cxx:618 +#: src/modplug/gui/interface.cxx:876 +#: src/modplug/gui/modplug.glade:1384 #: src/modplug/gui/modplug.glade:1784 msgid "General" msgstr "Allgemein" @@ -107,7 +146,8 @@ msgid "Sound quality" msgstr "Sound-Qualität" -#: src/adplug/adplug-xmms.cc:306 src/modplug/gui/interface.cxx:184 +#: src/adplug/adplug-xmms.cc:306 +#: src/modplug/gui/interface.cxx:184 #: src/modplug/gui/modplug.glade:113 msgid "Resolution" msgstr "Auflösung" @@ -120,37 +160,41 @@ msgid "16bit" msgstr "16 Bit" -#: src/adplug/adplug-xmms.cc:321 src/modplug/gui/interface.cxx:215 -#: src/modplug/gui/modplug.glade:199 src/timidity/interface.c:148 +#: src/adplug/adplug-xmms.cc:321 +#: src/modplug/gui/interface.cxx:215 +#: src/modplug/gui/modplug.glade:199 +#: src/timidity/interface.c:148 msgid "Channels" msgstr "Kanäle" -#: src/adplug/adplug-xmms.cc:323 src/filewriter/mp3.c:899 -#: src/sid/xmms-sid.glade:157 src/sid/xs_interface.c:288 +#: src/adplug/adplug-xmms.cc:323 +#: src/filewriter/mp3.c:899 +#: src/sid/xmms-sid.glade:157 +#: src/sid/xs_interface.c:288 #: src/timidity/interface.c:165 msgid "Mono" msgstr "Mono" -#: src/adplug/adplug-xmms.cc:328 src/filewriter/mp3.c:894 -#: src/modplug/gui/interface.cxx:201 src/modplug/gui/modplug.glade:159 -#: src/sid/xmms-sid.glade:176 src/sid/xs_interface.c:295 +#: src/adplug/adplug-xmms.cc:328 +#: src/filewriter/mp3.c:894 +#: src/modplug/gui/interface.cxx:201 +#: src/modplug/gui/modplug.glade:159 +#: src/sid/xmms-sid.glade:176 +#: src/sid/xs_interface.c:295 #: src/timidity/interface.c:173 msgid "Stereo" msgstr "Stereo" #: src/adplug/adplug-xmms.cc:332 -msgid "" -"Setting stereo is not recommended, unless you need to. This won't add any " -"stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!" -msgstr "" -"Vom Gebrauch von Stereo wird abgeraten, da es dem Klang keine Stereo-Effekte " -"hinzufügt - OPL2 ist nur Mono - aber mehr Rechenleistung benötigt!" +msgid "Setting stereo is not recommended, unless you need to. This won't add any stereo effects to the sound - OPL2 is just mono - but eats up more CPU power!" +msgstr "Vom Gebrauch von Stereo wird abgeraten, da es dem Klang keine Stereo-Effekte hinzufügt - OPL2 ist nur Mono - aber mehr Rechenleistung benötigt!" #: src/adplug/adplug-xmms.cc:340 msgid "Frequency" msgstr "Frequenz" -#: src/adplug/adplug-xmms.cc:376 src/adplug/adplug-xmms.cc:580 +#: src/adplug/adplug-xmms.cc:376 +#: src/adplug/adplug-xmms.cc:580 #: src/console/Audacious_Config.cxx:147 msgid "Playback" msgstr "Wiedergabe" @@ -160,10 +204,7 @@ msgstr "Liedende ermitteln" #: src/adplug/adplug-xmms.cc:384 -msgid "" -"If enabled, XMMS will detect a song's ending, stop it and advance in the " -"playlist. If disabled, XMMS won't take notice of a song's ending and loop it " -"all over again and again." +msgid "If enabled, XMMS will detect a song's ending, stop it and advance in the playlist. If disabled, XMMS won't take notice of a song's ending and loop it all over again and again." msgstr "" #: src/adplug/adplug-xmms.cc:395 @@ -183,20 +224,15 @@ msgstr "Erweiterung" #: src/adplug/adplug-xmms.cc:445 -msgid "" -"Selected file types will be recognized and played back by this plugin. " -"Deselected types will be ignored to make room for other plugins to play " -"these files." -msgstr "" -"Ausgewählte Dateitypen werden von diesem Plugin erkannt und abgespielt. " -"Deaktivierte Typen werden ignoriert, dass andere Plugins diese Dateien " -"abspielen können." +msgid "Selected file types will be recognized and played back by this plugin. Deselected types will be ignored to make room for other plugins to play these files." +msgstr "Ausgewählte Dateitypen werden von diesem Plugin erkannt und abgespielt. Deaktivierte Typen werden ignoriert, dass andere Plugins diese Dateien abspielen können." #: src/adplug/adplug-xmms.cc:531 msgid "AdPlug :: File Info" msgstr "AdPlug :: Dateiinformation" -#: src/adplug/adplug-xmms.cc:553 src/amidi-plug/i_configure-fluidsynth.c:448 +#: src/adplug/adplug-xmms.cc:553 +#: src/amidi-plug/i_configure-fluidsynth.c:448 msgid "Filename" msgstr "Dateiname" @@ -264,8 +300,10 @@ msgid "Timer: " msgstr "Timer: " -#: src/adplug/adplug-xmms.cc:731 src/console/Audacious_Config.cxx:225 -#: src/sid/xmms-sid.glade:332 src/sid/xs_interface.c:341 +#: src/adplug/adplug-xmms.cc:731 +#: src/console/Audacious_Config.cxx:225 +#: src/sid/xmms-sid.glade:332 +#: src/sid/xs_interface.c:341 msgid "Hz" msgstr "Hz" @@ -300,10 +338,22 @@ "\n" "http://www.snika.uklinux.net/xmms-alarm/" msgstr "" - -#: src/alarm/interface.c:71 src/lirc/about.c:114 -#: src/modplug/gui/interface.cxx:960 src/modplug/gui/modplug.glade:2010 -#: src/sid/xmms-sid.glade:3643 src/sid/xs_about.c:213 +"Ein XMMS-Plugin, das verwendet werden kann,\n" +"um zu einem bestimmten Zeitpunkt die\n" +"Wiedergabe zu starten.\n" +"\n" +"Alle Beschwerden senden an:\n" +"Adam Feakin \n" +"Daniel Stodden \n" +"\n" +"http://www.snika.uklinux.net/xmms-alarm/" + +#: src/alarm/interface.c:71 +#: src/lirc/about.c:114 +#: src/modplug/gui/interface.cxx:960 +#: src/modplug/gui/modplug.glade:2010 +#: src/sid/xmms-sid.glade:3643 +#: src/sid/xs_about.c:213 #: src/sid/xs_interface.c:1740 msgid "Close" msgstr "Schließen" @@ -316,12 +366,19 @@ msgid "This is your wakeup call." msgstr "" -#: src/alarm/interface.c:124 src/alarm/interface.c:1389 src/alsa/about.c:46 -#: src/alsa/configure.c:383 src/cdaudio-ng/cdaudio-ng.c:217 -#: src/flacng/plugin.c:726 src/gnomeshortcuts/gnomeshortcuts.c:290 -#: src/hotkey/plugin.c:914 src/modplug/gui/interface.cxx:692 -#: src/modplug/gui/modplug.glade:1622 src/pulse_audio/pulse_audio.c:692 -#: src/scrobbler/gtkstuff.c:44 src/sid/xmms-sid.glade:3066 +#: src/alarm/interface.c:124 +#: src/alarm/interface.c:1389 +#: src/alsa/about.c:46 +#: src/alsa/configure.c:383 +#: src/cdaudio-ng/cdaudio-ng.c:217 +#: src/flacng/plugin.c:726 +#: src/gnomeshortcuts/gnomeshortcuts.c:290 +#: src/hotkey/plugin.c:914 +#: src/modplug/gui/interface.cxx:692 +#: src/modplug/gui/modplug.glade:1622 +#: src/pulse_audio/pulse_audio.c:692 +#: src/scrobbler/gtkstuff.c:44 +#: src/sid/xmms-sid.glade:3066 #: src/sid/xs_interface.c:1243 msgid "OK" msgstr "OK" @@ -340,10 +397,7 @@ #: src/alarm/interface.c:213 msgid "" -"For safety reasons the \"quiet\" time must be at least 65 seconds longer " -"than the fading time, it must also be more than 10 seconds. This basically " -"means that there is a bug in the code and until I find a way of really " -"fixing it this message will appear :)\n" +"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n" "\n" "Your fading settings have NOT been saved\n" "\n" @@ -359,7 +413,8 @@ msgid "Alarm Settings" msgstr "Alarm-Einstellungen" -#: src/alarm/interface.c:404 src/alarm/interface.c:576 +#: src/alarm/interface.c:404 +#: src/alarm/interface.c:576 #: src/alarm/interface.c:948 msgid "Time" msgstr "Zeit" @@ -388,10 +443,15 @@ msgid "Choose the days for the alarm to come on" msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll" -#: src/alarm/interface.c:612 src/alarm/interface.c:660 -#: src/alarm/interface.c:708 src/alarm/interface.c:756 -#: src/alarm/interface.c:804 src/alarm/interface.c:852 -#: src/alarm/interface.c:900 src/OSS4/configure.c:138 src/OSS/configure.c:169 +#: src/alarm/interface.c:612 +#: src/alarm/interface.c:660 +#: src/alarm/interface.c:708 +#: src/alarm/interface.c:756 +#: src/alarm/interface.c:804 +#: src/alarm/interface.c:852 +#: src/alarm/interface.c:900 +#: src/OSS4/configure.c:138 +#: src/OSS/configure.c:169 msgid "Default" msgstr "Standard" @@ -435,15 +495,20 @@ msgid "Fading" msgstr "Übergang" -#: src/alarm/interface.c:1087 src/sid/xmms-sid.glade:2007 -#: src/sid/xmms-sid.glade:2178 src/sid/xmms-sid.glade:2676 -#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962 +#: src/alarm/interface.c:1087 +#: src/sid/xmms-sid.glade:2007 +#: src/sid/xmms-sid.glade:2178 +#: src/sid/xmms-sid.glade:2676 +#: src/sid/xs_interface.c:908 +#: src/sid/xs_interface.c:962 #: src/sid/xs_interface.c:1122 msgid "seconds" msgstr "Sekunden" -#: src/alarm/interface.c:1095 src/alarm/interface.c:1211 -#: src/modplug/gui/interface.cxx:539 src/modplug/gui/modplug.glade:1113 +#: src/alarm/interface.c:1095 +#: src/alarm/interface.c:1211 +#: src/modplug/gui/interface.cxx:539 +#: src/modplug/gui/modplug.glade:1113 msgid "Volume" msgstr "Lautstärke" @@ -459,7 +524,8 @@ msgid "Start at" msgstr "Beginnen bei" -#: src/alarm/interface.c:1158 src/alarm/interface.c:1202 +#: src/alarm/interface.c:1158 +#: src/alarm/interface.c:1202 msgid "%" msgstr "%" @@ -483,7 +549,8 @@ msgid "Browse..." msgstr "Suchen..." -#: src/alarm/interface.c:1295 src/alarm/interface.c:1460 +#: src/alarm/interface.c:1295 +#: src/alarm/interface.c:1460 msgid "Reminder" msgstr "Erinnerung" @@ -491,7 +558,8 @@ msgid "Use reminder" msgstr "Erinnerung benützen" -#: src/alarm/interface.c:1328 src/sndstretch/sndstretch_xmms.c:377 +#: src/alarm/interface.c:1328 +#: src/sndstretch/sndstretch_xmms.c:377 msgid "Options" msgstr "Optionen" @@ -604,7 +672,9 @@ msgid "ALSA Driver configuration" msgstr "ALSA-Treiber-Konfiguration" -#: src/alsa/configure.c:274 src/OSS4/configure.c:186 src/OSS/configure.c:217 +#: src/alsa/configure.c:274 +#: src/OSS4/configure.c:186 +#: src/OSS/configure.c:217 #: src/sun/configure.c:183 msgid "Audio device:" msgstr "Audiogerät:" @@ -617,7 +687,9 @@ msgid "Mixer card:" msgstr "Mixer-Karte:" -#: src/alsa/configure.c:313 src/OSS/configure.c:260 src/sun/configure.c:220 +#: src/alsa/configure.c:313 +#: src/OSS/configure.c:260 +#: src/sun/configure.c:220 msgid "Mixer device:" msgstr "Mixer-Gerät:" @@ -638,7 +710,8 @@ msgid "Period time (ms):" msgstr "Puffergrösse (ms):" -#: src/alsa/configure.c:376 src/amidi-plug/i_configure-ap.c:287 +#: src/alsa/configure.c:376 +#: src/amidi-plug/i_configure-ap.c:287 msgid "Advanced settings" msgstr "Erweiterte Einstellungen" @@ -648,13 +721,8 @@ #: src/amidi-plug/backend-alsa/b-alsa.c:37 msgid "" -"This backend sends MIDI events to a group of user-chosen ALSA sequencer " -"ports. The ALSA sequencer interface is very versatile, it can provide ports " -"for audio cards hardware synthesizers (i.e. emu10k1) but also for software " -"synths, external devices, etc.\n" -"This backend does not produce audio, MIDI events are handled directly from " -"devices/programs behind the ALSA ports; in example, MIDI events sent to the " -"hardware synth will be directly played.\n" +"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n" +"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n" "Backend written by Giacomo Lozito." msgstr "" @@ -664,9 +732,7 @@ #: src/amidi-plug/backend-dummy/b-dummy.c:37 msgid "" -"This backend does not produce audio at all. It is mostly useful for analysis " -"and testing purposes, as it can log all MIDI events to standard output, " -"standard error or file.\n" +"This backend does not produce audio at all. It is mostly useful for analysis and testing purposes, as it can log all MIDI events to standard output, standard error or file.\n" "Backend written by Giacomo Lozito." msgstr "" @@ -676,11 +742,8 @@ #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:37 msgid "" -"This backend produces audio by sending MIDI events to FluidSynth, a real-" -"time software synthesizer based on the SoundFont2 specification (www." -"fluidsynth.org).\n" -"Produced audio can be manipulated via player effect plugins and is processed " -"by chosen ouput plugin.\n" +"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n" +"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n" "Backend written by Giacomo Lozito." msgstr "" @@ -719,27 +782,19 @@ #: src/amidi-plug/i_configure-alsa.c:421 msgid "" "* Select ALSA output ports *\n" -"MIDI events will be sent to the ports selected here. In example, if your " -"audio card provides a hardware synth and you want to play MIDI with it, " -"you'll probably want to select the wavetable synthesizer ports." +"MIDI events will be sent to the ports selected here. In example, if your audio card provides a hardware synth and you want to play MIDI with it, you'll probably want to select the wavetable synthesizer ports." msgstr "" #: src/amidi-plug/i_configure-alsa.c:426 msgid "" "* Select ALSA mixer card *\n" -"The ALSA backend outputs directly through ALSA, it doesn't use effect and " -"ouput plugins from the player. During playback, the player volumeslider will " -"manipulate the mixer control you select here. If you're using wavetable " -"synthesizer ports, you'll probably want to select the Synth control here." +"The ALSA backend outputs directly through ALSA, it doesn't use effect and ouput plugins from the player. During playback, the player volumeslider will manipulate the mixer control you select here. If you're using wavetable synthesizer ports, you'll probably want to select the Synth control here." msgstr "" #: src/amidi-plug/i_configure-alsa.c:433 msgid "" "* Select ALSA mixer control *\n" -"The ALSA backend outputs directly through ALSA, it doesn't use effect and " -"ouput plugins from the player. During playback, the player volume slider " -"will manipulate the mixer control you select here. If you're using wavetable " -"synthesizer ports, you'll probably want to select the Synth control here." +"The ALSA backend outputs directly through ALSA, it doesn't use effect and ouput plugins from the player. During playback, the player volume slider will manipulate the mixer control you select here. If you're using wavetable synthesizer ports, you'll probably want to select the Synth control here." msgstr "" #: src/amidi-plug/i_configure-alsa.c:444 @@ -797,63 +852,40 @@ #: src/amidi-plug/i_configure-ap.c:320 msgid "" "* Backend selection *\n" -"AMIDI-Plug works with backends, in a modular fashion; here you should select " -"your backend; that is, the way MIDI events are going to be handled and " -"played.\n" -"If you have a hardware synthesizer on your audio card, and ALSA supports it, " -"you'll want to use the ALSA backend. It can also be used with anything that " -"provides an interface to the ALSA sequencer, including software synths or " -"external devices.\n" -"If you want to rely on a software synthesizer and/or want to pipe audio into " -"effect and output plugins of the player you'll want to use the good " -"FluidSynth backend.\n" +"AMIDI-Plug works with backends, in a modular fashion; here you should select your backend; that is, the way MIDI events are going to be handled and played.\n" +"If you have a hardware synthesizer on your audio card, and ALSA supports it, you'll want to use the ALSA backend. It can also be used with anything that provides an interface to the ALSA sequencer, including software synths or external devices.\n" +"If you want to rely on a software synthesizer and/or want to pipe audio into effect and output plugins of the player you'll want to use the good FluidSynth backend.\n" "Press the info button to read specific information about each backend." msgstr "" #: src/amidi-plug/i_configure-ap.c:331 msgid "" "* Transpose function *\n" -"This option allows you to play the midi file transposed in a different key, " -"by shifting of the desired number of semitones all its notes (excepting " -"those on midi channel 10, reserved for percussions). Expecially useful if " -"you wish to sing or play along with another instrument." +"This option allows you to play the midi file transposed in a different key, by shifting of the desired number of semitones all its notes (excepting those on midi channel 10, reserved for percussions). Expecially useful if you wish to sing or play along with another instrument." msgstr "" #: src/amidi-plug/i_configure-ap.c:337 msgid "" "* Drumshift function *\n" -"This option allows you to shift notes on midi channel 10 (the standard " -"percussions channel) of the desired number of semitones. This results in " -"different drumset and percussions being used during midi playback, so if you " -"wish to enhance (or reduce, or alter) percussion sounds, try to play with " -"this value." +"This option allows you to shift notes on midi channel 10 (the standard percussions channel) of the desired number of semitones. This results in different drumset and percussions being used during midi playback, so if you wish to enhance (or reduce, or alter) percussion sounds, try to play with this value." msgstr "" #: src/amidi-plug/i_configure-ap.c:344 msgid "" "* Pre-calculate MIDI length *\n" -"If this option is enabled, AMIDI-Plug will calculate the MIDI file length as " -"soon as the player requests it, instead of doing that only when the MIDI " -"file is being played. In example, MIDI length will be calculated straight " -"after adding MIDI files in a playlist. Disable this option if you want " -"faster playlist loading (when a lot of MIDI files are added), enable it to " -"display more information in the playlist straight after loading." +"If this option is enabled, AMIDI-Plug will calculate the MIDI file length as soon as the player requests it, instead of doing that only when the MIDI file is being played. In example, MIDI length will be calculated straight after adding MIDI files in a playlist. Disable this option if you want faster playlist loading (when a lot of MIDI files are added), enable it to display more information in the playlist straight after loading." msgstr "" #: src/amidi-plug/i_configure-ap.c:353 msgid "" "* Extract comments from MIDI files *\n" -"Some MIDI files contain text comments (author, copyright, instrument notes, " -"etc.). If this option is enabled, AMIDI-Plug will extract and display " -"comments (if available) in the file information dialog." +"Some MIDI files contain text comments (author, copyright, instrument notes, etc.). If this option is enabled, AMIDI-Plug will extract and display comments (if available) in the file information dialog." msgstr "" #: src/amidi-plug/i_configure-ap.c:358 msgid "" "* Extract lyrics from MIDI files *\n" -"Some MIDI files contain song lyrics. If this option is enabled, AMIDI-Plug " -"will extract and display song lyrics (if available) in the file information " -"dialog." +"Some MIDI files contain song lyrics. If this option is enabled, AMIDI-Plug will extract and display song lyrics (if available) in the file information dialog." msgstr "" #: src/amidi-plug/i_configure-ap.c:375 @@ -1074,74 +1106,47 @@ #: src/amidi-plug/i_configure-fluidsynth.c:807 msgid "" "* Select SoundFont files *\n" -"In order to play MIDI with FluidSynth, you need to specify at least one " -"valid SoundFont file here (use absolute paths). The loading order is from " -"the top (first) to the bottom (last)." +"In order to play MIDI with FluidSynth, you need to specify at least one valid SoundFont file here (use absolute paths). The loading order is from the top (first) to the bottom (last)." msgstr "" "* SoundFont-Dateien auswählen *\n" -"Um MIDI-Dateien mit FluidSynth abzuspielen, muss hier mindestens eine " -"gültige SoundFont-Datei angegeben werden (absolute Pfade verwenden). Die " -"Lade-Reihenfolge ist von der Spitze (erstes) bis zum The loading order is " -"from the top (first) to the bottom (last)." +"Um MIDI-Dateien mit FluidSynth abzuspielen, muss hier mindestens eine gültige SoundFont-Datei angegeben werden (absolute Pfade verwenden). Die Lade-Reihenfolge ist von der Spitze (erstes) bis zum The loading order is from the top (first) to the bottom (last)." #: src/amidi-plug/i_configure-fluidsynth.c:812 msgid "" "* Load SoundFont on player start *\n" -"Depending on your system speed, SoundFont loading in FluidSynth will require " -"up to a few seconds. This is a one-time task (the soundfont will stay loaded " -"until it is changed or the backend is unloaded) that can be done at player " -"start, or before the first MIDI file is played (the latter is a better " -"choice if you don't use your player to listen MIDI files only)." +"Depending on your system speed, SoundFont loading in FluidSynth will require up to a few seconds. This is a one-time task (the soundfont will stay loaded until it is changed or the backend is unloaded) that can be done at player start, or before the first MIDI file is played (the latter is a better choice if you don't use your player to listen MIDI files only)." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:820 msgid "" "* Load SoundFont on first midifile play *\n" -"Depending on your system speed, SoundFont loading in FluidSynth will require " -"up to a few seconds. This is a one-time task (the soundfont will stay loaded " -"until it is changed or the backend is unloaded) that can be done at player " -"start, or before the first MIDI file is played (the latter is a better " -"choice if you don't use your player to listen MIDI files only)." +"Depending on your system speed, SoundFont loading in FluidSynth will require up to a few seconds. This is a one-time task (the soundfont will stay loaded until it is changed or the backend is unloaded) that can be done at player start, or before the first MIDI file is played (the latter is a better choice if you don't use your player to listen MIDI files only)." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:828 msgid "" "* Synthesizer gain *\n" -"From FluidSynth docs: the gain is applied to the final or master output of " -"the synthesizer; it is set to a low value by default to avoid the saturation " -"of the output when random MIDI files are played." +"From FluidSynth docs: the gain is applied to the final or master output of the synthesizer; it is set to a low value by default to avoid the saturation of the output when random MIDI files are played." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:833 msgid "" "* Synthesizer polyphony *\n" -"From FluidSynth docs: the polyphony defines how many voices can be played in " -"parallel; the number of voices is not necessarily equivalent to the number " -"of notes played simultaneously; indeed, when a note is struck on a specific " -"MIDI channel, the preset on that channel may create several voices, for " -"example, one for the left audio channel and one for the right audio " -"channels; the number of voices activated depends on the number of instrument " -"zones that fall in the correspond to the velocity and key of the played note." +"From FluidSynth docs: the polyphony defines how many voices can be played in parallel; the number of voices is not necessarily equivalent to the number of notes played simultaneously; indeed, when a note is struck on a specific MIDI channel, the preset on that channel may create several voices, for example, one for the left audio channel and one for the right audio channels; the number of voices activated depends on the number of instrument zones that fall in the correspond to the velocity and key of the played note." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:843 #: src/amidi-plug/i_configure-fluidsynth.c:849 msgid "" "* Synthesizer reverb *\n" -"From FluidSynth docs: when set to \"yes\" the reverb effects module is " -"activated; note that when the reverb module is active, the amount of signal " -"sent to the reverb module depends on the \"reverb send\" generator defined " -"in the SoundFont." +"From FluidSynth docs: when set to \"yes\" the reverb effects module is activated; note that when the reverb module is active, the amount of signal sent to the reverb module depends on the \"reverb send\" generator defined in the SoundFont." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:855 #: src/amidi-plug/i_configure-fluidsynth.c:861 msgid "" "* Synthesizer chorus *\n" -"From FluidSynth docs: when set to \"yes\" the chorus effects module is " -"activated; note that when the chorus module is active, the amount of signal " -"sent to the chorus module depends on the \"chorus send\" generator defined " -"in the SoundFont." +"From FluidSynth docs: when set to \"yes\" the chorus effects module is activated; note that when the chorus module is active, the amount of signal sent to the chorus module depends on the \"chorus send\" generator defined in the SoundFont." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:867 @@ -1150,10 +1155,8 @@ #: src/amidi-plug/i_configure-fluidsynth.c:885 msgid "" "* Synthesizer samplerate *\n" -"The sample rate of the audio generated by the synthesizer. You can also " -"specify a custom value in the interval 22050Hz-96000Hz.\n" -"NOTE: the default buffer parameters are tuned for 44100Hz; changing the " -"sample rate may require buffer params tuning to obtain good sound quality." +"The sample rate of the audio generated by the synthesizer. You can also specify a custom value in the interval 22050Hz-96000Hz.\n" +"NOTE: the default buffer parameters are tuned for 44100Hz; changing the sample rate may require buffer params tuning to obtain good sound quality." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:891 @@ -1165,10 +1168,7 @@ #: src/amidi-plug/i_configure-fluidsynth.c:894 msgid "" "* FluidSynth backend buffer *\n" -"If you notice skips or slowness during song playback and your system is not " -"performing any cpu-intensive task (except FluidSynth itself), you may want " -"to adjust the buffer parameters. Try to move the \"handy buffer tuner\" some " -"steps to the right until playback is fluid again." +"If you notice skips or slowness during song playback and your system is not performing any cpu-intensive task (except FluidSynth itself), you may want to adjust the buffer parameters. Try to move the \"handy buffer tuner\" some steps to the right until playback is fluid again." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:900 @@ -1176,16 +1176,10 @@ #: src/amidi-plug/i_configure-fluidsynth.c:922 msgid "" "* FluidSynth backend buffer *\n" -"It is a good idea to make buffer adjustments with the \"handy buffer tuner\" " -"before resorting to manual editing of buffer parameters.\n" -"However, if you want to fine-tune something and want to know what you're " -"doing, you can understand how these parameters work by reading the backend " -"code (b-fluidsynth.c). In short words, every amount of time (proportional to " -"buffer_SIZE and sample rate), right before gathering samples, the buffer is " -"resized as follows:\n" +"It is a good idea to make buffer adjustments with the \"handy buffer tuner\" before resorting to manual editing of buffer parameters.\n" +"However, if you want to fine-tune something and want to know what you're doing, you can understand how these parameters work by reading the backend code (b-fluidsynth.c). In short words, every amount of time (proportional to buffer_SIZE and sample rate), right before gathering samples, the buffer is resized as follows:\n" "buffer_SIZE + buffer_MARGIN + extramargin\n" -"where extramargin is a value computed as number_of_seconds_of_playback / " -"margin_INCREMENT ." +"where extramargin is a value computed as number_of_seconds_of_playback / margin_INCREMENT ." msgstr "" #: src/amidi-plug/i_configure-fluidsynth.c:937 @@ -1212,8 +1206,10 @@ "backend" msgstr "" -#: src/amidi-plug/i_fileinfo.c:169 src/sid/xmms-sid.glade:3465 -#: src/sid/xs_interface.c:1684 src/vorbis/fileinfo.c:559 +#: src/amidi-plug/i_fileinfo.c:169 +#: src/sid/xmms-sid.glade:3465 +#: src/sid/xs_interface.c:1684 +#: src/vorbis/fileinfo.c:559 msgid "Name:" msgstr "Name:" @@ -1314,7 +1310,8 @@ msgid "Concave Rectangle" msgstr "Konkaves Rechteck" -#: src/aosd/aosd_style.c:87 src/hotkey/plugin.c:717 +#: src/aosd/aosd_style.c:87 +#: src/hotkey/plugin.c:717 msgid "None" msgstr "Kein" @@ -1331,10 +1328,7 @@ msgstr "Titeländerung" #: src/aosd/aosd_trigger.c:80 -msgid "" -"Triggers OSD when, during playback, the song title changes but the filename " -"is the same. This is mostly useful to display title changes in internet " -"streams." +msgid "Triggers OSD when, during playback, the song title changes but the filename is the same. This is mostly useful to display title changes in internet streams." msgstr "" #: src/aosd/aosd_trigger.c:86 @@ -1456,9 +1450,12 @@ msgid "Skin file:" msgstr "Skin-Datei:" -#: src/aosd/aosd_ui.c:644 src/sid/xmms-sid.glade:2331 -#: src/sid/xmms-sid.glade:2856 src/sid/xmms-sid.glade:2962 -#: src/sid/xs_interface.c:1010 src/sid/xs_interface.c:1182 +#: src/aosd/aosd_ui.c:644 +#: src/sid/xmms-sid.glade:2331 +#: src/sid/xmms-sid.glade:2856 +#: src/sid/xmms-sid.glade:2962 +#: src/sid/xs_interface.c:1010 +#: src/sid/xs_interface.c:1182 #: src/sid/xs_interface.c:1218 msgid "Browse" msgstr "Suchen" @@ -1478,8 +1475,7 @@ #: src/aosd/aosd_ui.c:808 msgid "" "Composite manager not detected;\n" -"unless you know that you have one running, please activate a composite " -"manager otherwise the OSD won't work properly" +"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly" msgstr "" #: src/aosd/aosd_ui.c:816 @@ -1539,9 +1535,12 @@ msgid "Trigger" msgstr "Auslöser" -#: src/aosd/aosd_ui.c:1076 src/cdaudio-ng/configure.c:149 -#: src/modplug/gui/interface.cxx:678 src/modplug/gui/modplug.glade:1583 -#: src/sid/xmms-sid.glade:3026 src/sid/xs_interface.c:1229 +#: src/aosd/aosd_ui.c:1076 +#: src/cdaudio-ng/configure.c:149 +#: src/modplug/gui/interface.cxx:678 +#: src/modplug/gui/modplug.glade:1583 +#: src/sid/xmms-sid.glade:3026 +#: src/sid/xs_interface.c:1229 msgid "Misc" msgstr "Verschiedenes" @@ -1569,6 +1568,15 @@ "http://neugierig.org/software/ghosd/\n" "\n" msgstr "" +"\n" +"http://www.develia.org/projects.php?p=audacious#aosd\n" +"geschrieben von Giacomo Lozito\n" +"< james@develia.org >\n" +"\n" +"On-Screen-Display basiert auf der Ghosd-Bibliothek\n" +"geschrieben von Evan Martin\n" +"http://neugierig.org/software/ghosd/\n" +"\n" #: src/arts/arts.c:22 msgid "About aRts Output" @@ -1584,18 +1592,27 @@ msgid "aRts Driver configuration" msgstr "aRts-Treiber-Konfiguration" -#: src/arts/configure.c:61 src/esd/configure.c:171 src/OSS4/configure.c:232 -#: src/OSS/configure.c:304 src/sun/configure.c:259 +#: src/arts/configure.c:61 +#: src/esd/configure.c:171 +#: src/OSS4/configure.c:232 +#: src/OSS/configure.c:304 +#: src/sun/configure.c:259 msgid "Buffering:" msgstr "Zwischenspeichern:" -#: src/arts/configure.c:73 src/esd/configure.c:184 src/OSS4/configure.c:245 -#: src/OSS/configure.c:317 src/sun/configure.c:272 +#: src/arts/configure.c:73 +#: src/esd/configure.c:184 +#: src/OSS4/configure.c:245 +#: src/OSS/configure.c:317 +#: src/sun/configure.c:272 msgid "Buffer size (ms):" msgstr "Puffergrösse (ms):" -#: src/arts/configure.c:83 src/esd/configure.c:209 src/OSS4/configure.c:270 -#: src/OSS/configure.c:342 src/sun/configure.c:304 +#: src/arts/configure.c:83 +#: src/esd/configure.c:209 +#: src/OSS4/configure.c:270 +#: src/OSS/configure.c:342 +#: src/sun/configure.c:304 msgid "Buffering" msgstr "Zwischenspeichern" @@ -1618,10 +1635,7 @@ msgstr "Über AudioCompress" #: src/audiocompress/audacious-glue.c:320 -msgid "" -"If checked, when the sound peaks the volume will be cut instantly; " -"otherwise, it will ramp down just in time for the peak (but some minor " -"clipping may still occur)." +msgid "If checked, when the sound peaks the volume will be cut instantly; otherwise, it will ramp down just in time for the peak (but some minor clipping may still occur)." msgstr "" #: src/audiocompress/audacious-glue.c:324 @@ -1633,9 +1647,7 @@ msgstr "" #: src/audiocompress/audacious-glue.c:328 -msgid "" -"The target audio level for ramping up. Lowering the value gives a bit more " -"dynamic range for peaks, but will make the overall sound quieter." +msgid "The target audio level for ramping up. Lowering the value gives a bit more dynamic range for peaks, but will make the overall sound quieter." msgstr "" #: src/audiocompress/audacious-glue.c:331 @@ -1675,9 +1687,7 @@ msgstr " Chronik " #: src/audiocompress/audacious-glue.c:517 -msgid "" -"How long of a history to maintain. A higher number will make the volume " -"changes less responsive." +msgid "How long of a history to maintain. A higher number will make the volume changes less responsive." msgstr "" #: src/audiocompress/audacious-glue.c:528 @@ -1688,8 +1698,10 @@ msgid "Audio values" msgstr "Audiowerte" -#: src/audiocompress/audacious-glue.c:562 src/echo_plugin/gui.c:152 -#: src/modplug/gui/interface.cxx:698 src/modplug/gui/modplug.glade:1635 +#: src/audiocompress/audacious-glue.c:562 +#: src/echo_plugin/gui.c:152 +#: src/modplug/gui/interface.cxx:698 +#: src/modplug/gui/modplug.glade:1635 #: src/stereo_plugin/stereo.c:132 msgid "Apply" msgstr "Übernehmen" @@ -1714,7 +1726,8 @@ msgid "Blur Scope: Color selection" msgstr "Blur Scope: Farbauswahl" -#: src/blur_scope/config.c:82 src/jack/configure.c:108 +#: src/blur_scope/config.c:82 +#: src/jack/configure.c:108 msgid "Options:" msgstr "Optionen:" @@ -1728,8 +1741,7 @@ #: src/cdaudio-ng/cdaudio-ng.c:213 msgid "" -"Copyright (c) 2007, by Calin Crisan and The Audacious " -"Team.\n" +"Copyright (c) 2007, by Calin Crisan and The Audacious Team.\n" "\n" "Many thanks to libcdio developers \n" "\tand to libcddb developers .\n" @@ -1738,11 +1750,9 @@ "\n" "This was a Google Summer of Code 2007 project." msgstr "" -"Copyright (c) 2007, von Calin Crisan und dem Audacious-" -"Team.\n" +"Copyright (c) 2007, von Calin Crisan und dem Audacious-Team.\n" "\n" -"Vielen Dank an die libcdio-Entwickler \n" +"Vielen Dank an die libcdio-Entwickler \n" "\tund die libcddb-Entwickler .\n" "\n" "Danke auch an Tony Vroon für die Beratung und die Hilfe.\n" @@ -1807,7 +1817,8 @@ msgid "Bass:" msgstr "Bass:" -#: src/console/Audacious_Config.cxx:166 src/console/Audacious_Config.cxx:177 +#: src/console/Audacious_Config.cxx:166 +#: src/console/Audacious_Config.cxx:177 #: src/console/Audacious_Config.cxx:198 msgid "secs" msgstr "sek" @@ -1820,8 +1831,10 @@ msgid "Default song length:" msgstr "Standard-Liedlänge:" -#: src/console/Audacious_Config.cxx:200 src/modplug/gui/interface.cxx:265 -#: src/modplug/gui/modplug.glade:338 src/sid/xmms-sid.glade:1243 +#: src/console/Audacious_Config.cxx:200 +#: src/modplug/gui/interface.cxx:265 +#: src/modplug/gui/modplug.glade:338 +#: src/sid/xmms-sid.glade:1243 #: src/sid/xs_interface.c:653 msgid "Resampling" msgstr "Resampling" @@ -1847,12 +1860,8 @@ msgstr "Hall verstärken" #: src/console/Audacious_Config.cxx:263 -msgid "" -"The default song length, expressed in seconds, is used for songs that do not " -"provide length information (i.e. looping tracks)." -msgstr "" -"Die standardmäßige Liedlänge (in Sekunden) wird für Lieder benutzt, die " -"keine Längeninformation beinhalten (z.B. Lieder in der Endlosschleife)." +msgid "The default song length, expressed in seconds, is used for songs that do not provide length information (i.e. looping tracks)." +msgstr "Die standardmäßige Liedlänge (in Sekunden) wird für Lieder benutzt, die keine Längeninformation beinhalten (z.B. Lieder in der Endlosschleife)." #: src/console/Audacious_Driver.cxx:444 msgid "About the Console Music Decoder" @@ -1930,7 +1939,8 @@ msgid "ESD Output Plugin configuration" msgstr "ESD-Ausgabe-Plugin-Konfiguration" -#: src/esd/configure.c:114 src/esd/configure.c:144 +#: src/esd/configure.c:114 +#: src/esd/configure.c:144 msgid "Host:" msgstr "Host:" @@ -1950,7 +1960,9 @@ msgid "Server" msgstr "Server" -#: src/esd/configure.c:198 src/OSS4/configure.c:259 src/OSS/configure.c:331 +#: src/esd/configure.c:198 +#: src/OSS4/configure.c:259 +#: src/OSS/configure.c:331 #: src/sun/configure.c:290 msgid "Pre-buffer (percent):" msgstr "" @@ -2025,34 +2037,24 @@ #: src/evdev-plug/ed_internals.c:93 #, c-format -msgid "" -"event-device-plugin: unable to open device file %s , skipping this device; " -"check that the file exists and that you have read permission for it\n" +msgid "event-device-plugin: unable to open device file %s , skipping this device; check that the file exists and that you have read permission for it\n" msgstr "" #: src/evdev-plug/ed_internals.c:102 #, c-format -msgid "" -"event-device-plugin: unable to create a io_channel for device file %s ," -"skipping this device\n" +msgid "event-device-plugin: unable to create a io_channel for device file %s ,skipping this device\n" msgstr "" #: src/evdev-plug/ed_internals.c:339 -msgid "" -"event-device-plugin: unable to open /proc/bus/input/devices , automatic " -"detection of event devices won't work.\n" +msgid "event-device-plugin: unable to open /proc/bus/input/devices , automatic detection of event devices won't work.\n" msgstr "" #: src/evdev-plug/ed_internals.c:348 -msgid "" -"event-device-plugin: unable to open a io_channel for /proc/bus/input/" -"devices , automatic detection of event devices won't work.\n" +msgid "event-device-plugin: unable to open a io_channel for /proc/bus/input/devices , automatic detection of event devices won't work.\n" msgstr "" #: src/evdev-plug/ed_internals.c:358 -msgid "" -"event-device-plugin: an error occurred while reading /proc/bus/input/" -"devices , automatic detection of event devices won't work.\n" +msgid "event-device-plugin: an error occurred while reading /proc/bus/input/devices , automatic detection of event devices won't work.\n" msgstr "" #: src/evdev-plug/ed_internals.c:421 @@ -2060,63 +2062,50 @@ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n" msgstr "" -#: src/evdev-plug/ed_internals.c:486 src/evdev-plug/ed_internals.c:580 +#: src/evdev-plug/ed_internals.c:486 +#: src/evdev-plug/ed_internals.c:580 #, c-format -msgid "" -"event-device-plugin: unable to load config file %s , default settings will " -"be used.\n" +msgid "event-device-plugin: unable to load config file %s , default settings will be used.\n" msgstr "" #: src/evdev-plug/ed_internals.c:532 #, c-format -msgid "" -"event-device-plugin: incomplete information in config file for device \"%s" -"\" , skipping.\n" -msgstr "" - -#: src/evdev-plug/ed_internals.c:601 src/evdev-plug/ed_internals.c:933 +msgid "event-device-plugin: incomplete information in config file for device \"%s\" , skipping.\n" +msgstr "" + +#: src/evdev-plug/ed_internals.c:601 +#: src/evdev-plug/ed_internals.c:933 #, c-format -msgid "" -"event-device-plugin: configuration, unable to get is_active value for device " -"\"%s\", skipping it.\n" +msgid "event-device-plugin: configuration, unable to get is_active value for device \"%s\", skipping it.\n" msgstr "" #: src/evdev-plug/ed_internals.c:837 #, c-format -msgid "" -"event-device-plugin: unable to access local directory %s , settings will not " -"be saved.\n" +msgid "event-device-plugin: unable to access local directory %s , settings will not be saved.\n" msgstr "" #: src/evdev-plug/ed_internals.c:887 #, c-format -msgid "" -"event-device-plugin: configuration, unable to get filename value for device " -"\"%s\", skipping it.\n" +msgid "event-device-plugin: configuration, unable to get filename value for device \"%s\", skipping it.\n" msgstr "" #: src/evdev-plug/ed_internals.c:903 #, c-format -msgid "" -"event-device-plugin: configuration, unable to get phys value for device \"%s" -"\", skipping it.\n" +msgid "event-device-plugin: configuration, unable to get phys value for device \"%s\", skipping it.\n" msgstr "" #: src/evdev-plug/ed_internals.c:919 #, c-format -msgid "" -"event-device-plugin: configuration, unable to get is_custom value for device " -"\"%s\", skipping it.\n" +msgid "event-device-plugin: configuration, unable to get is_custom value for device \"%s\", skipping it.\n" msgstr "" #: src/evdev-plug/ed_internals.c:943 #, c-format -msgid "" -"event-device-plugin: configuration, unexpected value for device \"%s\", " -"skipping it.\n" -msgstr "" - -#: src/evdev-plug/ed_ui.c:274 src/evdev-plug/ed_ui.c:410 +msgid "event-device-plugin: configuration, unexpected value for device \"%s\", skipping it.\n" +msgstr "" + +#: src/evdev-plug/ed_ui.c:274 +#: src/evdev-plug/ed_ui.c:410 #: src/evdev-plug/ed_ui.c:872 msgid "Information" msgstr "Information" @@ -2127,7 +2116,8 @@ "Ensure that the device has been correctly plugged in." msgstr "" -#: src/evdev-plug/ed_ui.c:318 src/madplug/plugin.c:619 +#: src/evdev-plug/ed_ui.c:318 +#: src/madplug/plugin.c:619 msgid "Error" msgstr "Fehler" @@ -2181,7 +2171,8 @@ msgid "Active" msgstr "" -#: src/evdev-plug/ed_ui.c:655 src/sun/configure.c:488 +#: src/evdev-plug/ed_ui.c:655 +#: src/sun/configure.c:488 msgid "Status" msgstr "Status" @@ -2212,8 +2203,7 @@ msgid "" "This input event has been already assigned.\n" "\n" -"It's not possible to assign multiple actions to the same input event " -"(although it's possible to assign the same action to multiple events)." +"It's not possible to assign multiple actions to the same input event (although it's possible to assign the same action to multiple events)." msgstr "" #: src/evdev-plug/ed_ui.c:1322 @@ -2277,7 +2267,8 @@ msgid "Output file format:" msgstr "Ausgabedatei-Format:" -#: src/filewriter/filewriter.c:506 src/ladspa/ladspa.c:960 +#: src/filewriter/filewriter.c:506 +#: src/ladspa/ladspa.c:960 msgid "Configure" msgstr "Konfigurieren" @@ -2314,12 +2305,8 @@ msgstr "Dateiendung nicht entfernen" #: src/filewriter/filewriter.c:585 -msgid "" -"If enabled, the extension from the original filename will not be stripped " -"before adding the new file extension to the end." -msgstr "" -"Wenn aktiviert, wird die Erweiterung des ursprünglichen Dateinamens nicht " -"entfernt, bevor die neue Dateierweiterung am Ende angefügt wird." +msgid "If enabled, the extension from the original filename will not be stripped before adding the new file extension to the end." +msgstr "Wenn aktiviert, wird die Erweiterung des ursprünglichen Dateinamens nicht entfernt, bevor die neue Dateierweiterung am Ende angefügt wird." #: src/filewriter/filewriter.c:599 msgid "Prepend track number to filename" @@ -2349,7 +2336,8 @@ msgid "Output Samplerate:" msgstr "Ausgabe-Abtastfrequenz:" -#: src/filewriter/mp3.c:743 src/filewriter/mp3.c:884 +#: src/filewriter/mp3.c:743 +#: src/filewriter/mp3.c:884 msgid "Auto" msgstr "Automatisch" @@ -2397,8 +2385,10 @@ msgid "Adds 16 bit checksum to every frame" msgstr "16-Bit-Prüfsumme zu jedem Frame hinzufügen" -#: src/filewriter/mp3.c:981 src/filewriter/vorbis.c:274 -#: src/modplug/gui/interface.cxx:309 src/modplug/gui/modplug.glade:487 +#: src/filewriter/mp3.c:981 +#: src/filewriter/vorbis.c:274 +#: src/modplug/gui/interface.cxx:309 +#: src/modplug/gui/modplug.glade:487 msgid "Quality" msgstr "Qualität" @@ -2435,12 +2425,8 @@ msgstr "Minimale Bitrate erzwingen" #: src/filewriter/mp3.c:1128 -msgid "" -"For use with players that do not support low bitrate mp3 (Apex AD600-A DVD/" -"mp3 player)" -msgstr "" -"Zur Benutzung mit Playern, die kein MP3 mit niedriger Bitrate unterstützen " -"(Apex AD600-A DVD/MP3 player)" +msgid "For use with players that do not support low bitrate mp3 (Apex AD600-A DVD/mp3 player)" +msgstr "Zur Benutzung mit Playern, die kein MP3 mit niedriger Bitrate unterstützen (Apex AD600-A DVD/MP3 player)" #: src/filewriter/mp3.c:1141 msgid "ABR Options:" @@ -2572,8 +2558,7 @@ #: src/hotkey/plugin.c:788 msgid "Configure keys which controls Audacious playback." -msgstr "" -"Tasten konfigurieren, die die Wiedergabe von Audacious kontrollieren." +msgstr "Tasten konfigurieren, die die Wiedergabe von Audacious kontrollieren." #: src/hotkey/plugin.c:795 msgid "Previous Track:" @@ -2659,8 +2644,7 @@ "\n" msgstr "" "Global-Hotkey-Plugin\n" -"Den Player mit globalen Tastenkombinationen oder Multimedia-Tasten " -"bedienen.\n" +"Den Player mit globalen Tastenkombinationen oder Multimedia-Tasten bedienen.\n" "\n" "Copyright (C) 2007 Sascha Hlusiak \n" "\n" @@ -2714,7 +2698,8 @@ "Chris Morgan \n" msgstr "" -#: src/jack/jack.c:118 src/wma/wma.c:157 +#: src/jack/jack.c:118 +#: src/wma/wma.c:157 msgid " Close " msgstr " Schliessen" @@ -2737,7 +2722,8 @@ msgid "This LADSPA plugin has no user controls" msgstr "" -#: src/ladspa/ladspa.c:767 src/ladspa/ladspa.c:853 +#: src/ladspa/ladspa.c:767 +#: src/ladspa/ladspa.c:853 msgid "Name" msgstr "Name" @@ -2875,12 +2861,15 @@ msgid "Preamp (dB):" msgstr "Vorverstärkung (dB):" -#: src/madplug/configure.c:233 src/musepack/libmpc.cxx:224 -#: src/vorbis/configure.c:219 src/wavpack/ui.cxx:545 +#: src/madplug/configure.c:233 +#: src/musepack/libmpc.cxx:224 +#: src/vorbis/configure.c:219 +#: src/wavpack/ui.cxx:545 msgid "ReplayGain" msgstr "ReplayGain" -#: src/madplug/configure.c:238 src/vorbis/configure.c:135 +#: src/madplug/configure.c:238 +#: src/vorbis/configure.c:135 msgid "Override generic titles" msgstr "Allgemeine Titel überschreiben" @@ -2888,12 +2877,15 @@ msgid "ID3 format:" msgstr "ID3-Format:" -#: src/madplug/configure.c:261 src/sid/xmms-sid.glade:2540 -#: src/sid/xs_interface.c:1070 src/vorbis/configure.c:158 +#: src/madplug/configure.c:261 +#: src/sid/xmms-sid.glade:2540 +#: src/sid/xs_interface.c:1070 +#: src/vorbis/configure.c:158 msgid "Title" msgstr "Titel" -#: src/madplug/fileinfo.c:158 src/madplug/fileinfo.c:236 +#: src/madplug/fileinfo.c:158 +#: src/madplug/fileinfo.c:236 msgid "File Info" msgstr "Dateiinformationen" @@ -2917,38 +2909,57 @@ msgid " ID3 Tag " msgstr "ID3-Tag" -#: src/madplug/fileinfo.c:425 src/musepack/libmpc.cxx:514 src/tta/libtta.c:321 -#: src/vorbis/fileinfo.c:582 src/wavpack/ui.cxx:170 +#: src/madplug/fileinfo.c:425 +#: src/musepack/libmpc.cxx:514 +#: src/tta/libtta.c:321 +#: src/vorbis/fileinfo.c:582 +#: src/wavpack/ui.cxx:170 msgid "Title:" msgstr "Titel:" -#: src/madplug/fileinfo.c:435 src/musepack/libmpc.cxx:518 src/tta/libtta.c:331 -#: src/vorbis/fileinfo.c:593 src/wavpack/ui.cxx:182 +#: src/madplug/fileinfo.c:435 +#: src/musepack/libmpc.cxx:518 +#: src/tta/libtta.c:331 +#: src/vorbis/fileinfo.c:593 +#: src/wavpack/ui.cxx:182 msgid "Artist:" msgstr "Künstler:" -#: src/madplug/fileinfo.c:445 src/musepack/libmpc.cxx:522 src/tta/libtta.c:342 -#: src/vorbis/fileinfo.c:604 src/wavpack/ui.cxx:194 +#: src/madplug/fileinfo.c:445 +#: src/musepack/libmpc.cxx:522 +#: src/tta/libtta.c:342 +#: src/vorbis/fileinfo.c:604 +#: src/wavpack/ui.cxx:194 msgid "Album:" msgstr "Album:" -#: src/madplug/fileinfo.c:455 src/musepack/libmpc.cxx:526 src/tta/libtta.c:353 -#: src/vorbis/fileinfo.c:615 src/wavpack/ui.cxx:206 +#: src/madplug/fileinfo.c:455 +#: src/musepack/libmpc.cxx:526 +#: src/tta/libtta.c:353 +#: src/vorbis/fileinfo.c:615 +#: src/wavpack/ui.cxx:206 msgid "Comment:" msgstr "Kommentar:" -#: src/madplug/fileinfo.c:465 src/musepack/libmpc.cxx:530 src/tta/libtta.c:364 +#: src/madplug/fileinfo.c:465 +#: src/musepack/libmpc.cxx:530 +#: src/tta/libtta.c:364 #: src/wavpack/ui.cxx:219 msgid "Year:" msgstr "Jahr:" -#: src/madplug/fileinfo.c:476 src/tta/libtta.c:376 src/vorbis/fileinfo.c:638 +#: src/madplug/fileinfo.c:476 +#: src/tta/libtta.c:376 +#: src/vorbis/fileinfo.c:638 #: src/wavpack/ui.cxx:232 msgid "Track number:" msgstr "Titelnummer:" -#: src/madplug/fileinfo.c:487 src/musepack/libmpc.cxx:540 src/tta/libtta.c:388 -#: src/vorbis/fileinfo.c:650 src/wavpack/ui.cxx:246 +#: src/madplug/fileinfo.c:487 +#: src/musepack/libmpc.cxx:540 +#: src/tta/libtta.c:388 +#: src/vorbis/fileinfo.c:650 +#: src/wavpack/ui.cxx:246 msgid "Genre:" msgstr "Genre:" @@ -2956,7 +2967,9 @@ msgid "Unknown" msgstr "Unbekannt" -#: src/madplug/fileinfo.c:620 src/musepack/libmpc.cxx:634 src/tta/libtta.c:411 +#: src/madplug/fileinfo.c:620 +#: src/musepack/libmpc.cxx:634 +#: src/tta/libtta.c:411 #: src/wavpack/ui.cxx:407 #, c-format msgid "File Info - %s" @@ -2972,7 +2985,8 @@ msgid "VBR (avg. %d kbps)" msgstr "" -#: src/madplug/fileinfo.c:660 src/vorbis/fileinfo.c:959 +#: src/madplug/fileinfo.c:660 +#: src/vorbis/fileinfo.c:959 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -3070,105 +3084,133 @@ "z.B. tact://77 zum Spielen von 77 Schlägen pro Minute\n" "oder tact://60*3/4 zum Spielen von 60 bpm im 3/4-Takt" -#: src/metronom/metronom.c:198 src/metronom/metronom.c:262 +#: src/metronom/metronom.c:198 +#: src/metronom/metronom.c:262 #, c-format msgid "Tact generator: %d bpm" msgstr "Takt-Generator: %d bpm" -#: src/metronom/metronom.c:200 src/metronom/metronom.c:264 +#: src/metronom/metronom.c:200 +#: src/metronom/metronom.c:264 #, c-format msgid "Tact generator: %d bpm %d/%d" msgstr "Takt-Generator: %d bpm %d/%d" -#: src/modplug/gui/interface.cxx:133 src/modplug/gui/modplug.glade:9 +#: src/modplug/gui/interface.cxx:133 +#: src/modplug/gui/modplug.glade:9 msgid "ModPlug Configuration" msgstr "ModPlug-Konfiguration" -#: src/modplug/gui/interface.cxx:170 src/modplug/gui/modplug.glade:73 +#: src/modplug/gui/interface.cxx:170 +#: src/modplug/gui/modplug.glade:73 #: src/timidity/interface.c:140 msgid "16 bit" msgstr "16 bit" -#: src/modplug/gui/interface.cxx:177 src/modplug/gui/modplug.glade:92 +#: src/modplug/gui/interface.cxx:177 +#: src/modplug/gui/modplug.glade:92 #: src/timidity/interface.c:132 msgid "8 bit" msgstr "8 bit" -#: src/modplug/gui/interface.cxx:208 src/modplug/gui/modplug.glade:178 +#: src/modplug/gui/interface.cxx:208 +#: src/modplug/gui/modplug.glade:178 msgid "Mono (downmix)" msgstr "Mono (downmix)" -#: src/modplug/gui/interface.cxx:237 src/modplug/gui/modplug.glade:258 +#: src/modplug/gui/interface.cxx:237 +#: src/modplug/gui/modplug.glade:258 msgid "Nearest (fastest)" msgstr "Am nähesten (schnellstes)" -#: src/modplug/gui/interface.cxx:244 src/modplug/gui/modplug.glade:277 +#: src/modplug/gui/interface.cxx:244 +#: src/modplug/gui/modplug.glade:277 msgid "Linear (fast)" msgstr "Linear (schnell)" -#: src/modplug/gui/interface.cxx:251 src/modplug/gui/modplug.glade:297 +#: src/modplug/gui/interface.cxx:251 +#: src/modplug/gui/modplug.glade:297 msgid "Spline (good quality)" msgstr "Spline (gute Qualität)" -#: src/modplug/gui/interface.cxx:258 src/modplug/gui/modplug.glade:317 +#: src/modplug/gui/interface.cxx:258 +#: src/modplug/gui/modplug.glade:317 msgid "8-tap Fir (extremely high quality)" msgstr "8-tap Fir (extrem hohe Qualität)" -#: src/modplug/gui/interface.cxx:282 src/modplug/gui/modplug.glade:384 +#: src/modplug/gui/interface.cxx:282 +#: src/modplug/gui/modplug.glade:384 msgid "44 kHz" msgstr "44 kHz" -#: src/modplug/gui/interface.cxx:289 src/modplug/gui/modplug.glade:403 +#: src/modplug/gui/interface.cxx:289 +#: src/modplug/gui/modplug.glade:403 msgid "22 kHz" msgstr "22 kHz" -#: src/modplug/gui/interface.cxx:296 src/modplug/gui/modplug.glade:423 +#: src/modplug/gui/interface.cxx:296 +#: src/modplug/gui/modplug.glade:423 msgid "11 kHz" msgstr "11 kHz" -#: src/modplug/gui/interface.cxx:304 src/modplug/gui/modplug.glade:444 +#: src/modplug/gui/interface.cxx:304 +#: src/modplug/gui/modplug.glade:444 #: src/timidity/interface.c:74 msgid "Sampling Rate" msgstr "Abtastfrequenz" -#: src/modplug/gui/interface.cxx:338 src/modplug/gui/interface.cxx:400 -#: src/modplug/gui/interface.cxx:466 src/modplug/gui/interface.cxx:528 -#: src/modplug/gui/modplug.glade:540 src/modplug/gui/modplug.glade:719 -#: src/modplug/gui/modplug.glade:910 src/modplug/gui/modplug.glade:1089 +#: src/modplug/gui/interface.cxx:338 +#: src/modplug/gui/interface.cxx:400 +#: src/modplug/gui/interface.cxx:466 +#: src/modplug/gui/interface.cxx:528 +#: src/modplug/gui/modplug.glade:540 +#: src/modplug/gui/modplug.glade:719 +#: src/modplug/gui/modplug.glade:910 +#: src/modplug/gui/modplug.glade:1089 msgid "Enable" msgstr "Aktivieren" -#: src/modplug/gui/interface.cxx:367 src/modplug/gui/interface.cxx:495 -#: src/modplug/gui/modplug.glade:607 src/modplug/gui/modplug.glade:977 +#: src/modplug/gui/interface.cxx:367 +#: src/modplug/gui/interface.cxx:495 +#: src/modplug/gui/modplug.glade:607 +#: src/modplug/gui/modplug.glade:977 msgid "Depth" msgstr "Tiefe" -#: src/modplug/gui/interface.cxx:375 src/modplug/gui/interface.cxx:503 -#: src/modplug/gui/modplug.glade:635 src/modplug/gui/modplug.glade:1005 +#: src/modplug/gui/interface.cxx:375 +#: src/modplug/gui/interface.cxx:503 +#: src/modplug/gui/modplug.glade:635 +#: src/modplug/gui/modplug.glade:1005 msgid "Delay" msgstr "Verzögerung" -#: src/modplug/gui/interface.cxx:383 src/modplug/gui/modplug.glade:672 +#: src/modplug/gui/interface.cxx:383 +#: src/modplug/gui/modplug.glade:672 msgid "Reverb" msgstr "Hall" -#: src/modplug/gui/interface.cxx:429 src/modplug/gui/modplug.glade:786 +#: src/modplug/gui/interface.cxx:429 +#: src/modplug/gui/modplug.glade:786 msgid "Amount" msgstr "Menge" -#: src/modplug/gui/interface.cxx:437 src/modplug/gui/modplug.glade:814 +#: src/modplug/gui/interface.cxx:437 +#: src/modplug/gui/modplug.glade:814 msgid "Range" msgstr "Bereich" -#: src/modplug/gui/interface.cxx:445 src/modplug/gui/modplug.glade:851 +#: src/modplug/gui/interface.cxx:445 +#: src/modplug/gui/modplug.glade:851 msgid "Bass Boost" msgstr "Bassverstärkung" -#: src/modplug/gui/interface.cxx:511 src/modplug/gui/modplug.glade:1042 +#: src/modplug/gui/interface.cxx:511 +#: src/modplug/gui/modplug.glade:1042 msgid "Surround" msgstr "Surround" -#: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163 +#: src/modplug/gui/interface.cxx:550 +#: src/modplug/gui/modplug.glade:1163 msgid "" "Note: Setting the preamp\n" "too high may cause clipping\n" @@ -3177,55 +3219,68 @@ "Bemerkung: Eine zu hohe Vorverstärkung kann\n" "Clipping verursachen (störende Geräusche)!" -#: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192 +#: src/modplug/gui/interface.cxx:556 +#: src/modplug/gui/modplug.glade:1192 msgid "Preamp" msgstr "Vorverstärkung" -#: src/modplug/gui/interface.cxx:561 src/modplug/gui/modplug.glade:1235 +#: src/modplug/gui/interface.cxx:561 +#: src/modplug/gui/modplug.glade:1235 msgid "Effects" msgstr "Effekte" -#: src/modplug/gui/interface.cxx:590 src/modplug/gui/modplug.glade:1287 +#: src/modplug/gui/interface.cxx:590 +#: src/modplug/gui/modplug.glade:1287 msgid "Use Filename as Song Title" msgstr "Dateinamen als Liedtitel verwenden" -#: src/modplug/gui/interface.cxx:595 src/modplug/gui/modplug.glade:1306 +#: src/modplug/gui/interface.cxx:595 +#: src/modplug/gui/modplug.glade:1306 msgid "Fast Playlist Info" msgstr "Schnelle Wiedergabenliste-Information" -#: src/modplug/gui/interface.cxx:606 src/modplug/gui/modplug.glade:1338 +#: src/modplug/gui/interface.cxx:606 +#: src/modplug/gui/modplug.glade:1338 msgid "Noise Reduction" msgstr "Geräuschreduktion" -#: src/modplug/gui/interface.cxx:612 src/modplug/gui/modplug.glade:1357 +#: src/modplug/gui/interface.cxx:612 +#: src/modplug/gui/modplug.glade:1357 msgid "Play Amiga MOD" msgstr "Amiga MOD abspielen" -#: src/modplug/gui/interface.cxx:635 src/modplug/gui/modplug.glade:1430 +#: src/modplug/gui/interface.cxx:635 +#: src/modplug/gui/modplug.glade:1430 msgid "Don't loop" msgstr "Nicht loopen" -#: src/modplug/gui/interface.cxx:647 src/modplug/gui/modplug.glade:1455 +#: src/modplug/gui/interface.cxx:647 +#: src/modplug/gui/modplug.glade:1455 msgid "Loop" msgstr "Loope" -#: src/modplug/gui/interface.cxx:660 src/modplug/gui/modplug.glade:1493 +#: src/modplug/gui/interface.cxx:660 +#: src/modplug/gui/modplug.glade:1493 msgid "time(s)" msgstr "Mal" -#: src/modplug/gui/interface.cxx:666 src/modplug/gui/modplug.glade:1526 +#: src/modplug/gui/interface.cxx:666 +#: src/modplug/gui/modplug.glade:1526 msgid "Loop forever" msgstr "Für immer loopen" -#: src/modplug/gui/interface.cxx:673 src/modplug/gui/modplug.glade:1547 +#: src/modplug/gui/interface.cxx:673 +#: src/modplug/gui/modplug.glade:1547 msgid "Looping" msgstr "Loopen" -#: src/modplug/gui/interface.cxx:847 src/modplug/gui/modplug.glade:1668 +#: src/modplug/gui/interface.cxx:847 +#: src/modplug/gui/modplug.glade:1668 msgid "MOD Info" msgstr "MOD-Information" -#: src/modplug/gui/interface.cxx:866 src/modplug/gui/modplug.glade:1710 +#: src/modplug/gui/interface.cxx:866 +#: src/modplug/gui/modplug.glade:1710 msgid "" "Filename:\n" "Title:\n" @@ -3249,7 +3304,8 @@ "Patterns:\n" "Kanäle:" -#: src/modplug/gui/interface.cxx:871 src/modplug/gui/modplug.glade:1744 +#: src/modplug/gui/interface.cxx:871 +#: src/modplug/gui/modplug.glade:1744 msgid "" "---\n" "---\n" @@ -3263,15 +3319,18 @@ "---" msgstr "" -#: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849 +#: src/modplug/gui/interface.cxx:901 +#: src/modplug/gui/modplug.glade:1849 msgid "Samples" msgstr "Samples" -#: src/modplug/gui/interface.cxx:926 src/modplug/gui/modplug.glade:1914 +#: src/modplug/gui/interface.cxx:926 +#: src/modplug/gui/modplug.glade:1914 msgid "Instruments" msgstr "Instrumente" -#: src/modplug/gui/interface.cxx:947 src/modplug/gui/modplug.glade:1971 +#: src/modplug/gui/interface.cxx:947 +#: src/modplug/gui/modplug.glade:1971 msgid "Message" msgstr "Meldung" @@ -3299,8 +3358,10 @@ msgid "About Modplug" msgstr "Über Modplug" -#: src/modplug/gui/support.cxx:88 src/modplug/gui/support.cxx:112 -#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114 +#: src/modplug/gui/support.cxx:88 +#: src/modplug/gui/support.cxx:112 +#: src/sid/xs_glade.c:90 +#: src/sid/xs_glade.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte Pixmap-Datei nicht finden: %s" @@ -3337,11 +3398,13 @@ msgid "General Settings" msgstr "Allgemeine Einstellungen" -#: src/musepack/libmpc.cxx:183 src/wavpack/ui.cxx:490 +#: src/musepack/libmpc.cxx:183 +#: src/wavpack/ui.cxx:490 msgid "Enable Dynamic Bitrate Display" msgstr "Dynamische-Bitraten-Anzeige aktivieren" -#: src/musepack/libmpc.cxx:187 src/wavpack/ui.cxx:496 +#: src/musepack/libmpc.cxx:187 +#: src/wavpack/ui.cxx:496 msgid "Plugin" msgstr "Plugin" @@ -3349,12 +3412,14 @@ msgid "ReplayGain Settings" msgstr "ReplayGain-Einstellungen" -#: src/musepack/libmpc.cxx:197 src/vorbis/configure.c:170 +#: src/musepack/libmpc.cxx:197 +#: src/vorbis/configure.c:170 #: src/wavpack/ui.cxx:508 msgid "Enable Clipping Prevention" msgstr "Clipping-Verhinderung aktivieren" -#: src/musepack/libmpc.cxx:202 src/vorbis/configure.c:175 +#: src/musepack/libmpc.cxx:202 +#: src/vorbis/configure.c:175 #: src/wavpack/ui.cxx:513 msgid "Enable ReplayGain" msgstr "ReplayGain aktivieren" @@ -3371,8 +3436,11 @@ msgid "Use Album Gain" msgstr "Album Gain benutzen" -#: src/musepack/libmpc.cxx:491 src/sid/xmms-sid.glade:3144 -#: src/sid/xs_interface.c:1564 src/tta/libtta.c:302 src/wavpack/ui.cxx:150 +#: src/musepack/libmpc.cxx:491 +#: src/sid/xmms-sid.glade:3144 +#: src/sid/xs_interface.c:1564 +#: src/tta/libtta.c:302 +#: src/wavpack/ui.cxx:150 msgid "Filename:" msgstr "Dateiname:" @@ -3384,12 +3452,15 @@ msgid "Track:" msgstr "Titel:" -#: src/musepack/libmpc.cxx:551 src/sid/xmms-sid.glade:1732 -#: src/sid/xs_interface.c:820 src/wavpack/ui.cxx:265 +#: src/musepack/libmpc.cxx:551 +#: src/sid/xmms-sid.glade:1732 +#: src/sid/xs_interface.c:820 +#: src/wavpack/ui.cxx:265 msgid "Save" msgstr "Speichern" -#: src/musepack/libmpc.cxx:554 src/wavpack/ui.cxx:271 +#: src/musepack/libmpc.cxx:554 +#: src/wavpack/ui.cxx:271 msgid "Remove Tag" msgstr "Tag entfernen" @@ -3508,24 +3579,31 @@ "USA." msgstr "" -#: src/OSS4/configure.c:120 src/OSS/configure.c:151 +#: src/OSS4/configure.c:120 +#: src/OSS/configure.c:151 #, c-format msgid "Default (%s)" msgstr "Standard (%s)" -#: src/OSS4/configure.c:170 src/OSS/configure.c:201 +#: src/OSS4/configure.c:170 +#: src/OSS/configure.c:201 msgid "OSS Driver configuration" msgstr "OSS-Treiber-Konfiguration" -#: src/OSS4/configure.c:208 src/OSS/configure.c:239 src/OSS/configure.c:280 +#: src/OSS4/configure.c:208 +#: src/OSS/configure.c:239 +#: src/OSS/configure.c:280 msgid "Use alternate device:" msgstr "Alternatives Gerät benutzen:" -#: src/OSS4/configure.c:230 src/OSS/configure.c:302 src/sun/configure.c:248 +#: src/OSS4/configure.c:230 +#: src/OSS/configure.c:302 +#: src/sun/configure.c:248 msgid "Devices" msgstr "Geräte" -#: src/OSS4/configure.c:272 src/OSS/configure.c:343 +#: src/OSS4/configure.c:272 +#: src/OSS/configure.c:343 msgid "Mixer Settings:" msgstr "Mixer-Einstellungen:" @@ -3533,7 +3611,9 @@ msgid "Save VMIX volume between sessions" msgstr "" -#: src/OSS4/configure.c:284 src/OSS/configure.c:355 src/sun/configure.c:394 +#: src/OSS4/configure.c:284 +#: src/OSS/configure.c:355 +#: src/sun/configure.c:394 msgid "Mixer" msgstr "Mixer" @@ -3593,11 +3673,13 @@ msgid "Services" msgstr "Dienste" -#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:161 +#: src/scrobbler/configure.c:121 +#: src/scrobbler/configure.c:161 msgid "Username:" msgstr "Benutzername:" -#: src/scrobbler/configure.c:127 src/scrobbler/configure.c:167 +#: src/scrobbler/configure.c:127 +#: src/scrobbler/configure.c:167 msgid "Password:" msgstr "Passwort:" @@ -3613,13 +3695,11 @@ msgid "" "Audacious AudioScrobbler Plugin\n" "\n" -"Originally created by Audun Hove and Pipian \n" +"Originally created by Audun Hove and Pipian \n" msgstr "" "Audacious AudioScrobbler-Plugin\n" "\n" -"Ursprünglich erstellt von Audun Hove und Pipian " -"\n" +"Ursprünglich erstellt von Audun Hove und Pipian \n" #: src/scrobbler/gtkstuff.c:23 msgid "About Scrobbler Plugin" @@ -3669,548 +3749,606 @@ msgid "Oversampling rate-conversion pass failed.\n" msgstr "" -#: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:221 +#: src/sid/xmms-sid.glade:8 +#: src/sid/xs_interface.c:221 msgid "Audacious-SID configuration" msgstr "Audacious-SID-Konfiguration" -#: src/sid/xmms-sid.glade:71 src/sid/xs_interface.c:257 +#: src/sid/xmms-sid.glade:71 +#: src/sid/xs_interface.c:257 msgid "8-bit" msgstr "8 Bit" -#: src/sid/xmms-sid.glade:90 src/sid/xs_interface.c:264 +#: src/sid/xmms-sid.glade:90 +#: src/sid/xs_interface.c:264 msgid "16-bit" msgstr "16 Bit" -#: src/sid/xmms-sid.glade:111 src/sid/xs_interface.c:271 +#: src/sid/xmms-sid.glade:111 +#: src/sid/xs_interface.c:271 msgid "Resolution:" msgstr "Auflösung:" -#: src/sid/xmms-sid.glade:196 src/sid/xs_interface.c:302 +#: src/sid/xmms-sid.glade:196 +#: src/sid/xs_interface.c:302 msgid "Autopanning" msgstr "" -#: src/sid/xmms-sid.glade:217 src/sid/xs_interface.c:309 -#: src/vorbis/fileinfo.c:864 src/vorbis/fileinfo.c:921 +#: src/sid/xmms-sid.glade:217 +#: src/sid/xs_interface.c:309 +#: src/vorbis/fileinfo.c:864 +#: src/vorbis/fileinfo.c:921 msgid "Channels:" msgstr "Kanäle:" -#: src/sid/xmms-sid.glade:384 src/sid/xs_interface.c:353 +#: src/sid/xmms-sid.glade:384 +#: src/sid/xs_interface.c:353 msgid "Samplerate:" msgstr "Abtastfrequenz:" -#: src/sid/xmms-sid.glade:430 src/sid/xs_interface.c:370 +#: src/sid/xmms-sid.glade:430 +#: src/sid/xs_interface.c:370 msgid "Use oversampling" msgstr "Oversampling benützen" -#: src/sid/xmms-sid.glade:456 src/sid/xs_interface.c:381 +#: src/sid/xmms-sid.glade:456 +#: src/sid/xs_interface.c:381 msgid "Factor:" msgstr "Faktor:" -#: src/sid/xmms-sid.glade:500 src/sid/xs_interface.c:393 +#: src/sid/xmms-sid.glade:500 +#: src/sid/xs_interface.c:393 msgid "Large factors require more CPU-power" msgstr "Große Faktoren benötigen mehr Rechenleistung" -#: src/sid/xmms-sid.glade:534 src/sid/xs_interface.c:399 +#: src/sid/xmms-sid.glade:534 +#: src/sid/xs_interface.c:399 msgid "Oversampling:" msgstr "Oversampling:" -#: src/sid/xmms-sid.glade:570 src/sid/xs_interface.c:404 +#: src/sid/xmms-sid.glade:570 +#: src/sid/xs_interface.c:404 msgid "Audio" msgstr "Audio" -#: src/sid/xmms-sid.glade:620 src/sid/xs_interface.c:436 -msgid "" -"If enabled, this option \"forces\" the emulation engine to use the selected " -"clock speed/frequency. Otherwise the speed is determined from played file " -"itself." -msgstr "" - -#: src/sid/xmms-sid.glade:622 src/sid/xs_interface.c:432 +#: src/sid/xmms-sid.glade:620 +#: src/sid/xs_interface.c:436 +msgid "If enabled, this option \"forces\" the emulation engine to use the selected clock speed/frequency. Otherwise the speed is determined from played file itself." +msgstr "" + +#: src/sid/xmms-sid.glade:622 +#: src/sid/xs_interface.c:432 msgid "Force speed" msgstr "Geschwindigkeit erzwingen" -#: src/sid/xmms-sid.glade:640 src/sid/xs_interface.c:442 -msgid "" -"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. " -"Most of SID-tunes have been made for PAL computers." -msgstr "" - -#: src/sid/xmms-sid.glade:642 src/sid/xs_interface.c:438 +#: src/sid/xmms-sid.glade:640 +#: src/sid/xs_interface.c:442 +msgid "PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers." +msgstr "" + +#: src/sid/xmms-sid.glade:642 +#: src/sid/xs_interface.c:438 msgid "PAL (50 Hz)" msgstr "PAL (50 Hz)" -#: src/sid/xmms-sid.glade:660 src/sid/xs_interface.c:450 -msgid "" -"NTSC is the TV standard with 60Hz vertical refresh rate (and other features " -"that differ from PAL). It is mainly used in United States, Japan and certain " -"other countries." -msgstr "" - -#: src/sid/xmms-sid.glade:662 src/sid/xs_interface.c:446 +#: src/sid/xmms-sid.glade:660 +#: src/sid/xs_interface.c:450 +msgid "NTSC is the TV standard with 60Hz vertical refresh rate (and other features that differ from PAL). It is mainly used in United States, Japan and certain other countries." +msgstr "" + +#: src/sid/xmms-sid.glade:662 +#: src/sid/xs_interface.c:446 msgid "NTSC (60 Hz)" msgstr "NTSC (60 Hz)" -#: src/sid/xmms-sid.glade:683 src/sid/xs_interface.c:454 +#: src/sid/xmms-sid.glade:683 +#: src/sid/xs_interface.c:454 msgid "Clock speed:" msgstr "" -#: src/sid/xmms-sid.glade:728 src/sid/xs_interface.c:475 -msgid "" -"If enabled, this option \"forces\" the emulation engine to use the selected " -"SID-chip model. Otherwise the preferred SID model is determined from the " -"file (if PSIDv2NG type) or if not available, this setting is used." -msgstr "" - -#: src/sid/xmms-sid.glade:730 src/sid/xs_interface.c:471 +#: src/sid/xmms-sid.glade:728 +#: src/sid/xs_interface.c:475 +msgid "If enabled, this option \"forces\" the emulation engine to use the selected SID-chip model. Otherwise the preferred SID model is determined from the file (if PSIDv2NG type) or if not available, this setting is used." +msgstr "" + +#: src/sid/xmms-sid.glade:730 +#: src/sid/xs_interface.c:471 msgid "Force model" msgstr "Modell erzwingen" -#: src/sid/xmms-sid.glade:748 src/sid/xs_interface.c:481 -msgid "" -"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 " -"in few ways, having much fuller filter (which, due to design error, is never " -"same between two different SID-chips) and has the \"volume adjustment bug\", " -"which enables playing of digital samples." -msgstr "" - -#: src/sid/xmms-sid.glade:750 src/sid/xs_interface.c:477 +#: src/sid/xmms-sid.glade:748 +#: src/sid/xs_interface.c:481 +msgid "MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 in few ways, having much fuller filter (which, due to design error, is never same between two different SID-chips) and has the \"volume adjustment bug\", which enables playing of digital samples." +msgstr "" + +#: src/sid/xmms-sid.glade:750 +#: src/sid/xs_interface.c:477 msgid "MOS 6581" msgstr "MOS 6581" -#: src/sid/xmms-sid.glade:769 src/sid/xs_interface.c:485 +#: src/sid/xmms-sid.glade:769 +#: src/sid/xs_interface.c:485 msgid "MOS 8580" msgstr "MOS 8580" -#: src/sid/xmms-sid.glade:790 src/sid/xs_interface.c:492 +#: src/sid/xmms-sid.glade:790 +#: src/sid/xs_interface.c:492 msgid "SID model:" msgstr "SID-Modell:" -#: src/sid/xmms-sid.glade:842 src/sid/xs_interface.c:513 -msgid "" -"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most " -"cases, though." -msgstr "" - -#: src/sid/xmms-sid.glade:844 src/sid/xs_interface.c:509 +#: src/sid/xmms-sid.glade:842 +#: src/sid/xs_interface.c:513 +msgid "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though." +msgstr "" + +#: src/sid/xmms-sid.glade:844 +#: src/sid/xs_interface.c:509 msgid "SIDPlay 1 (frame-based)" msgstr "" -#: src/sid/xmms-sid.glade:863 src/sid/xs_interface.c:521 -msgid "" -"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact " -"emulation." -msgstr "" - -#: src/sid/xmms-sid.glade:865 src/sid/xs_interface.c:517 +#: src/sid/xmms-sid.glade:863 +#: src/sid/xs_interface.c:521 +msgid "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation." +msgstr "" + +#: src/sid/xmms-sid.glade:865 +#: src/sid/xs_interface.c:517 msgid "SIDPlay 2 (cycle-based)" msgstr "SIDPlay 2 (zyklus-basiert)" -#: src/sid/xmms-sid.glade:887 src/sid/xs_interface.c:525 +#: src/sid/xmms-sid.glade:887 +#: src/sid/xs_interface.c:525 msgid "Emulation library selection:" msgstr "Auswahl der Emulations-Bibliothek:" -#: src/sid/xmms-sid.glade:933 src/sid/xs_interface.c:542 +#: src/sid/xmms-sid.glade:933 +#: src/sid/xs_interface.c:542 msgid "Real C64 (SIDPlay 2 only)" msgstr "Echter C64 (nur SIDPlay 2)" -#: src/sid/xmms-sid.glade:952 src/sid/xs_interface.c:549 +#: src/sid/xmms-sid.glade:952 +#: src/sid/xs_interface.c:549 msgid "Bank switching" msgstr "" -#: src/sid/xmms-sid.glade:972 src/sid/xs_interface.c:556 +#: src/sid/xmms-sid.glade:972 +#: src/sid/xs_interface.c:556 msgid "Transparent ROM" msgstr "" -#: src/sid/xmms-sid.glade:992 src/sid/xs_interface.c:563 +#: src/sid/xmms-sid.glade:992 +#: src/sid/xs_interface.c:563 msgid "PlaySID environment" msgstr "PlaySID-Umgebung" -#: src/sid/xmms-sid.glade:1013 src/sid/xs_interface.c:570 +#: src/sid/xmms-sid.glade:1013 +#: src/sid/xs_interface.c:570 msgid "Memory mode:" msgstr "Speichermodus:" -#: src/sid/xmms-sid.glade:1049 src/sid/xs_interface.c:575 +#: src/sid/xmms-sid.glade:1049 +#: src/sid/xs_interface.c:575 msgid "Emu#1" msgstr "" -#: src/sid/xmms-sid.glade:1093 src/sid/xs_interface.c:602 -msgid "" -"This setting can be used to enable libSIDPlay2's \"optimization mode\", " -"which in downgrades the emulation from cycle-exact to something similar to " -"frame-exact. The result is lower CPU usage, but worse accuracy." -msgstr "" - -#: src/sid/xmms-sid.glade:1095 src/sid/xs_interface.c:598 +#: src/sid/xmms-sid.glade:1093 +#: src/sid/xs_interface.c:602 +msgid "This setting can be used to enable libSIDPlay2's \"optimization mode\", which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy." +msgstr "" + +#: src/sid/xmms-sid.glade:1095 +#: src/sid/xs_interface.c:598 msgid "Optimization mode (faster, inaccurate)" msgstr "Optimierungs-Modus (schneller, ungenau)" -#: src/sid/xmms-sid.glade:1113 src/sid/xs_interface.c:608 -msgid "" -"reSID is the software SID-chip simulator based on SID reverse-engineering, " -"created by Dag Lem. It is probably the closest thing to real SID available " -"as software-only emulation." -msgstr "" - -#: src/sid/xmms-sid.glade:1115 src/sid/xs_interface.c:604 +#: src/sid/xmms-sid.glade:1113 +#: src/sid/xs_interface.c:608 +msgid "reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation." +msgstr "" + +#: src/sid/xmms-sid.glade:1115 +#: src/sid/xs_interface.c:604 msgid "reSID-emulation" msgstr "reSID-Emulation" -#: src/sid/xmms-sid.glade:1133 src/sid/xs_interface.c:616 -msgid "" -"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a " -"real SID-chip. Software can be used to control the HardSID and combined with " -"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to " -"achieve \"near 100%\" similarity to real C64. For more information, see " -"http://www.hardsid.com/" -msgstr "" - -#: src/sid/xmms-sid.glade:1135 src/sid/xs_interface.c:612 +#: src/sid/xmms-sid.glade:1133 +#: src/sid/xs_interface.c:616 +msgid "HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve \"near 100%\" similarity to real C64. For more information, see http://www.hardsid.com/" +msgstr "" + +#: src/sid/xmms-sid.glade:1135 +#: src/sid/xs_interface.c:612 msgid "HardSID" msgstr "HardSID" -#: src/sid/xmms-sid.glade:1156 src/sid/xs_interface.c:620 +#: src/sid/xmms-sid.glade:1156 +#: src/sid/xs_interface.c:620 msgid "SIDPlay 2 options:" msgstr "SIDPlay 2-Optionen:" -#: src/sid/xmms-sid.glade:1201 src/sid/xs_interface.c:641 -msgid "" -"Fastest and also worst sounding sampling method, simply picks nearest " -"neighbouring sample." -msgstr "" - -#: src/sid/xmms-sid.glade:1203 src/sid/xs_interface.c:637 +#: src/sid/xmms-sid.glade:1201 +#: src/sid/xs_interface.c:641 +msgid "Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample." +msgstr "" + +#: src/sid/xmms-sid.glade:1203 +#: src/sid/xs_interface.c:637 msgid "Fast (nearest neighbour)" msgstr "" -#: src/sid/xmms-sid.glade:1221 src/sid/xs_interface.c:649 -msgid "" -"Uses linear interpolation between samples, yielding higher audio quality " -"with less sampling noise." -msgstr "" - -#: src/sid/xmms-sid.glade:1223 src/sid/xs_interface.c:645 +#: src/sid/xmms-sid.glade:1221 +#: src/sid/xs_interface.c:649 +msgid "Uses linear interpolation between samples, yielding higher audio quality with less sampling noise." +msgstr "" + +#: src/sid/xmms-sid.glade:1223 +#: src/sid/xs_interface.c:645 msgid "Linear interpolation" msgstr "Lineare Interpolation" -#: src/sid/xmms-sid.glade:1263 src/sid/xs_interface.c:660 +#: src/sid/xmms-sid.glade:1263 +#: src/sid/xs_interface.c:660 msgid "Resampling (FIR)" msgstr "Resampling (FIR)" -#: src/sid/xmms-sid.glade:1284 src/sid/xs_interface.c:667 +#: src/sid/xmms-sid.glade:1284 +#: src/sid/xs_interface.c:667 msgid "reSID sampling options:" msgstr "reSID-Sampling-Optionen:" -#: src/sid/xmms-sid.glade:1320 src/sid/xs_interface.c:672 +#: src/sid/xmms-sid.glade:1320 +#: src/sid/xs_interface.c:672 msgid "Emu#2" msgstr "" -#: src/sid/xmms-sid.glade:1350 src/sid/xs_interface.c:688 -msgid "" -"This option enables emulation of SID filter. The filter is an essential part " -"of SID's sound capacity, but accurate emulation of it may require quite much " -"CPU power. However, if filter emulation is disabled, tunes won't sound " -"authentic at all if they utilize the filter." -msgstr "" - -#: src/sid/xmms-sid.glade:1352 src/sid/xs_interface.c:684 +#: src/sid/xmms-sid.glade:1350 +#: src/sid/xs_interface.c:688 +msgid "This option enables emulation of SID filter. The filter is an essential part of SID's sound capacity, but accurate emulation of it may require quite much CPU power. However, if filter emulation is disabled, tunes won't sound authentic at all if they utilize the filter." +msgstr "" + +#: src/sid/xmms-sid.glade:1352 +#: src/sid/xs_interface.c:684 msgid "Emulate filters" msgstr "Filter emulieren" -#: src/sid/xmms-sid.glade:1409 src/sid/xs_interface.c:713 +#: src/sid/xmms-sid.glade:1409 +#: src/sid/xs_interface.c:713 msgid "FS" msgstr "" -#: src/sid/xmms-sid.glade:1460 src/sid/xs_interface.c:730 +#: src/sid/xmms-sid.glade:1460 +#: src/sid/xs_interface.c:730 msgid "FM" msgstr "" -#: src/sid/xmms-sid.glade:1511 src/sid/xs_interface.c:747 +#: src/sid/xmms-sid.glade:1511 +#: src/sid/xs_interface.c:747 msgid "FT" msgstr "" -#: src/sid/xmms-sid.glade:1549 src/sid/xs_interface.c:758 +#: src/sid/xmms-sid.glade:1549 +#: src/sid/xs_interface.c:758 msgid "Reset values" msgstr "Werte zurücksetzen" -#: src/sid/xmms-sid.glade:1578 src/sid/xs_interface.c:763 +#: src/sid/xmms-sid.glade:1578 +#: src/sid/xs_interface.c:763 msgid "SIDPlay1" msgstr "SIDPlay1" -#: src/sid/xmms-sid.glade:1690 src/sid/xs_interface.c:804 +#: src/sid/xmms-sid.glade:1690 +#: src/sid/xs_interface.c:804 msgid "Export" msgstr "Exportieren" -#: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:812 +#: src/sid/xmms-sid.glade:1711 +#: src/sid/xs_interface.c:812 msgid "Use" msgstr "" -#: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:828 +#: src/sid/xmms-sid.glade:1753 +#: src/sid/xs_interface.c:828 msgid "Import" msgstr "Importieren" -#: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:836 +#: src/sid/xmms-sid.glade:1774 +#: src/sid/xs_interface.c:836 msgid "Delete" msgstr "Löschen" -#: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:850 +#: src/sid/xmms-sid.glade:1819 +#: src/sid/xs_interface.c:850 msgid "Filter curve:" msgstr "Filterkurve:" -#: src/sid/xmms-sid.glade:1855 src/sid/xs_interface.c:855 +#: src/sid/xmms-sid.glade:1855 +#: src/sid/xs_interface.c:855 msgid "SIDPlay2" msgstr "SIDPlay2" -#: src/sid/xmms-sid.glade:1891 src/sid/xs_interface.c:861 +#: src/sid/xmms-sid.glade:1891 +#: src/sid/xs_interface.c:861 msgid "Filters" msgstr "Filter" -#: src/sid/xmms-sid.glade:1935 src/sid/xs_interface.c:888 -msgid "" -"If enabled, the tune is played at least for the specified time, adding " -"silence to the end if necessary." -msgstr "" -"Wenn aktiviert, wird das Stück mindestens für die angegebene Zeit " -"abgespielt, wobei nötigenfalls Stille zum Ende hinzugefügt wird." - -#: src/sid/xmms-sid.glade:1937 src/sid/xs_interface.c:884 +#: src/sid/xmms-sid.glade:1935 +#: src/sid/xs_interface.c:888 +msgid "If enabled, the tune is played at least for the specified time, adding silence to the end if necessary." +msgstr "Wenn aktiviert, wird das Stück mindestens für die angegebene Zeit abgespielt, wobei nötigenfalls Stille zum Ende hinzugefügt wird." + +#: src/sid/xmms-sid.glade:1937 +#: src/sid/xs_interface.c:884 msgid "Play at least for specified time" msgstr "Mindestens für die angegebene Zeit spielen" -#: src/sid/xmms-sid.glade:1962 src/sid/xmms-sid.glade:2133 -#: src/sid/xmms-sid.glade:2632 src/sid/xs_interface.c:895 -#: src/sid/xs_interface.c:949 src/sid/xs_interface.c:1109 +#: src/sid/xmms-sid.glade:1962 +#: src/sid/xmms-sid.glade:2133 +#: src/sid/xmms-sid.glade:2632 +#: src/sid/xs_interface.c:895 +#: src/sid/xs_interface.c:949 +#: src/sid/xs_interface.c:1109 msgid "Playtime:" msgstr "Spielzeit:" -#: src/sid/xmms-sid.glade:2041 src/sid/xs_interface.c:915 +#: src/sid/xmms-sid.glade:2041 +#: src/sid/xs_interface.c:915 msgid "Minimum playtime:" msgstr "Minimale Spielzeit:" -#: src/sid/xmms-sid.glade:2086 src/sid/xs_interface.c:936 -msgid "" -"If enabled, tune is played until specified duration is reached (aka maximum " -"playtime)." -msgstr "" - -#: src/sid/xmms-sid.glade:2088 src/sid/xs_interface.c:932 +#: src/sid/xmms-sid.glade:2086 +#: src/sid/xs_interface.c:936 +msgid "If enabled, tune is played until specified duration is reached (aka maximum playtime)." +msgstr "" + +#: src/sid/xmms-sid.glade:2088 +#: src/sid/xs_interface.c:932 msgid "Play for specified time maximum" msgstr "" -#: src/sid/xmms-sid.glade:2107 src/sid/xs_interface.c:942 -msgid "" -"If enabled, the maximum playtime is applied only if song/tune length is not " -"known." -msgstr "" - -#: src/sid/xmms-sid.glade:2109 src/sid/xs_interface.c:938 +#: src/sid/xmms-sid.glade:2107 +#: src/sid/xs_interface.c:942 +msgid "If enabled, the maximum playtime is applied only if song/tune length is not known." +msgstr "" + +#: src/sid/xmms-sid.glade:2109 +#: src/sid/xs_interface.c:938 msgid "Only when song length is unknown" msgstr "" -#: src/sid/xmms-sid.glade:2212 src/sid/xs_interface.c:969 +#: src/sid/xmms-sid.glade:2212 +#: src/sid/xs_interface.c:969 msgid "Maximum playtime:" msgstr "Maximale Spielzeit:" -#: src/sid/xmms-sid.glade:2257 src/sid/xs_interface.c:990 -msgid "" -"This option enables using of XSIDPLAY compatible song length database. " -"(Refer to Audacious-SID documentation for more information)" -msgstr "" - -#: src/sid/xmms-sid.glade:2259 src/sid/xs_interface.c:986 +#: src/sid/xmms-sid.glade:2257 +#: src/sid/xs_interface.c:990 +msgid "This option enables using of XSIDPLAY compatible song length database. (Refer to Audacious-SID documentation for more information)" +msgstr "" + +#: src/sid/xmms-sid.glade:2259 +#: src/sid/xs_interface.c:986 msgid "Use XSIDPLAY-compatible database" msgstr "XSIDPLAY-kompatible Datenbank benützen" -#: src/sid/xmms-sid.glade:2284 src/sid/xs_interface.c:997 +#: src/sid/xmms-sid.glade:2284 +#: src/sid/xs_interface.c:997 msgid "DB-file:" msgstr "DB-Datei:" -#: src/sid/xmms-sid.glade:2309 src/sid/xs_interface.c:1007 +#: src/sid/xmms-sid.glade:2309 +#: src/sid/xs_interface.c:1007 msgid "Database path and filename" msgstr "Datenbankpfad und -dateiname" -#: src/sid/xmms-sid.glade:2329 src/sid/xs_interface.c:1014 +#: src/sid/xmms-sid.glade:2329 +#: src/sid/xs_interface.c:1014 msgid "Browse for song length-database file" msgstr "" -#: src/sid/xmms-sid.glade:2356 src/sid/xs_interface.c:1016 +#: src/sid/xmms-sid.glade:2356 +#: src/sid/xs_interface.c:1016 msgid "Song length database:" msgstr "" -#: src/sid/xmms-sid.glade:2392 src/sid/xs_interface.c:1021 +#: src/sid/xmms-sid.glade:2392 +#: src/sid/xs_interface.c:1021 msgid "Songlength" msgstr "" -#: src/sid/xmms-sid.glade:2430 src/sid/xs_interface.c:1043 -msgid "" -"By enabling this option you can specify a custom Tuplez formatting string " -"for SID-files. The SID-plugin specific Tuplez tags are described shortly " -"below." -msgstr "" - -#: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039 +#: src/sid/xmms-sid.glade:2430 +#: src/sid/xs_interface.c:1043 +msgid "By enabling this option you can specify a custom Tuplez formatting string for SID-files. The SID-plugin specific Tuplez tags are described shortly below." +msgstr "" + +#: src/sid/xmms-sid.glade:2432 +#: src/sid/xs_interface.c:1039 #, fuzzy msgid "Override generic Tuplez format string" msgstr "Allgemeine Titel überschreiben" -#: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054 +#: src/sid/xmms-sid.glade:2457 +#: src/sid/xs_interface.c:1054 msgid "Tuplez format string for SID-files" msgstr "" -#: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057 +#: src/sid/xmms-sid.glade:2477 +#: src/sid/xs_interface.c:1057 msgid "Descriptions of SID-specific Tuplez fields go here. :D" msgstr "" -#: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065 +#: src/sid/xmms-sid.glade:2511 +#: src/sid/xs_interface.c:1065 #, fuzzy msgid "Song title format:" msgstr "Titelformat:" -#: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096 -msgid "" -"If enabled, sub-tunes of each file will be added to playlist. If disabled, " -"only the default sub-tune will be added." -msgstr "" - -#: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092 +#: src/sid/xmms-sid.glade:2584 +#: src/sid/xs_interface.c:1096 +msgid "If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added." +msgstr "" + +#: src/sid/xmms-sid.glade:2586 +#: src/sid/xs_interface.c:1092 msgid "Add sub-tunes to playlist" msgstr "" -#: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102 +#: src/sid/xmms-sid.glade:2605 +#: src/sid/xs_interface.c:1102 msgid "Only add sub-tunes that have a duration of at least specified time." msgstr "" -#: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098 +#: src/sid/xmms-sid.glade:2607 +#: src/sid/xs_interface.c:1098 msgid "Only tunes with specified minimum duration" msgstr "" -#: src/sid/xmms-sid.glade:2710 src/sid/xs_interface.c:1129 +#: src/sid/xmms-sid.glade:2710 +#: src/sid/xs_interface.c:1129 #, fuzzy msgid "Sub-tune handling:" msgstr "Lautstärkesteuerung:" -#: src/sid/xmms-sid.glade:2755 src/sid/xs_interface.c:1150 -msgid "" -"If this option is enabled (and the database & HVSC settings below are " -"correctly set), Audacious-SID will use and display additional information " -"from STIL database when HVSC SIDs are played." -msgstr "" - -#: src/sid/xmms-sid.glade:2757 src/sid/xs_interface.c:1146 +#: src/sid/xmms-sid.glade:2755 +#: src/sid/xs_interface.c:1150 +msgid "If this option is enabled (and the database & HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played." +msgstr "" + +#: src/sid/xmms-sid.glade:2757 +#: src/sid/xs_interface.c:1146 msgid "Use STIL database" msgstr "STIL-Datenbank verwenden" -#: src/sid/xmms-sid.glade:2782 src/sid/xs_interface.c:1157 +#: src/sid/xmms-sid.glade:2782 +#: src/sid/xs_interface.c:1157 msgid "STIL file:" msgstr "STIL-Datei:" -#: src/sid/xmms-sid.glade:2819 src/sid/xs_interface.c:1173 -msgid "" -"Path and filename of STIL database file (STIL.txt), usually found from " -"HVSC's DOCUMENTS-subdirectory." -msgstr "" -"Pfad und Dateiname der STIL-Datenbank-Datei (STIL.txt), üblicherweise im " -"HVSC-DOCUMENTS-Unterverzeichnis." - -#: src/sid/xmms-sid.glade:2854 src/sid/xs_interface.c:1186 +#: src/sid/xmms-sid.glade:2819 +#: src/sid/xs_interface.c:1173 +msgid "Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory." +msgstr "Pfad und Dateiname der STIL-Datenbank-Datei (STIL.txt), üblicherweise im HVSC-DOCUMENTS-Unterverzeichnis." + +#: src/sid/xmms-sid.glade:2854 +#: src/sid/xs_interface.c:1186 msgid "Browse for STIL-database file" msgstr "Nach STIL-Datenbank-Datei suchen" -#: src/sid/xmms-sid.glade:2888 src/sid/xs_interface.c:1193 +#: src/sid/xmms-sid.glade:2888 +#: src/sid/xs_interface.c:1193 msgid "HVSC path:" msgstr "HVSC-Pfad:" -#: src/sid/xmms-sid.glade:2925 src/sid/xs_interface.c:1209 -msgid "" -"Path to base-directory of your High Voltage SID Collection (HVSC), for " -"example /media/C64Music/" -msgstr "" -"Pfad zum Basis-Verzeichnis der High Voltage SID Collection (HVSC), zum " -"Beispiel /media/C64Music/" - -#: src/sid/xmms-sid.glade:2960 src/sid/xs_interface.c:1222 +#: src/sid/xmms-sid.glade:2925 +#: src/sid/xs_interface.c:1209 +msgid "Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/" +msgstr "Pfad zum Basis-Verzeichnis der High Voltage SID Collection (HVSC), zum Beispiel /media/C64Music/" + +#: src/sid/xmms-sid.glade:2960 +#: src/sid/xs_interface.c:1222 msgid "Browse for HVSC path" msgstr "Nach HVSC-Pfad suchen" -#: src/sid/xmms-sid.glade:2990 src/sid/xs_interface.c:1224 +#: src/sid/xmms-sid.glade:2990 +#: src/sid/xs_interface.c:1224 msgid "SID Tune Information List (STIL) database:" msgstr "SID Tune Information List (STIL)-Datenbank:" -#: src/sid/xmms-sid.glade:3063 src/sid/xs_interface.c:1248 +#: src/sid/xmms-sid.glade:3063 +#: src/sid/xs_interface.c:1248 msgid "Accept and update changes" msgstr "" -#: src/sid/xmms-sid.glade:3077 src/sid/xs_interface.c:1255 +#: src/sid/xmms-sid.glade:3077 +#: src/sid/xs_interface.c:1255 msgid "Cancel any changes" msgstr "Alle Änderungen verwerfen" -#: src/sid/xmms-sid.glade:3102 src/sid/xs_interface.c:1543 +#: src/sid/xmms-sid.glade:3102 +#: src/sid/xs_interface.c:1543 msgid "Audacious-SID Fileinfo" msgstr "Audacious-SID-Dateiinformation" -#: src/sid/xmms-sid.glade:3172 src/sid/xs_interface.c:1572 +#: src/sid/xmms-sid.glade:3172 +#: src/sid/xs_interface.c:1572 msgid "Songname:" msgstr "Titel:" -#: src/sid/xmms-sid.glade:3200 src/sid/xs_interface.c:1580 +#: src/sid/xmms-sid.glade:3200 +#: src/sid/xs_interface.c:1580 msgid "Composer:" msgstr "Komponist:" -#: src/sid/xmms-sid.glade:3228 src/sid/xs_interface.c:1588 +#: src/sid/xmms-sid.glade:3228 +#: src/sid/xs_interface.c:1588 #: src/vorbis/fileinfo.c:720 msgid "Copyright:" msgstr "Copyright:" -#: src/sid/xmms-sid.glade:3342 src/sid/xs_interface.c:1632 +#: src/sid/xmms-sid.glade:3342 +#: src/sid/xs_interface.c:1632 msgid "Song Information:" msgstr "Titel-Information:" -#: src/sid/xmms-sid.glade:3416 src/sid/xs_interface.c:1667 +#: src/sid/xmms-sid.glade:3416 +#: src/sid/xs_interface.c:1667 msgid "Author:" msgstr "Autor:" -#: src/sid/xmms-sid.glade:3514 src/sid/xs_interface.c:1701 +#: src/sid/xmms-sid.glade:3514 +#: src/sid/xs_interface.c:1701 msgid "Duration:" msgstr "Länge:" -#: src/sid/xmms-sid.glade:3608 src/sid/xs_interface.c:1735 +#: src/sid/xmms-sid.glade:3608 +#: src/sid/xs_interface.c:1735 #, fuzzy msgid "Sub-tune Information:" msgstr "Ort:" -#: src/sid/xmms-sid.glade:3662 src/sid/xs_interface.c:1796 +#: src/sid/xmms-sid.glade:3662 +#: src/sid/xs_interface.c:1796 msgid "Select HVSC song length database" msgstr "HVSC-Titellängendatenbank auswählen" -#: src/sid/xmms-sid.glade:3704 src/sid/xs_interface.c:1837 +#: src/sid/xmms-sid.glade:3704 +#: src/sid/xs_interface.c:1837 msgid "Select STIL-database" msgstr "STIL-Datenbank auswählen" -#: src/sid/xmms-sid.glade:3746 src/sid/xs_interface.c:1878 +#: src/sid/xmms-sid.glade:3746 +#: src/sid/xs_interface.c:1878 msgid "Select HVSC location prefix" msgstr "" -#: src/sid/xmms-sid.glade:3788 src/sid/xs_interface.c:1919 +#: src/sid/xmms-sid.glade:3788 +#: src/sid/xs_interface.c:1919 msgid "Select SIDPlay2 filters file for importing" msgstr "" -#: src/sid/xmms-sid.glade:3830 src/sid/xs_interface.c:1960 +#: src/sid/xmms-sid.glade:3830 +#: src/sid/xs_interface.c:1960 msgid "Select SIDPlay2 filters file for exporting" msgstr "" -#: src/sid/xmms-sid.glade:3871 src/sid/xmms-sid.glade:3953 -#: src/sid/xs_interface.c:2008 src/sid/xs_interface.c:2021 +#: src/sid/xmms-sid.glade:3871 +#: src/sid/xmms-sid.glade:3953 +#: src/sid/xs_interface.c:2008 +#: src/sid/xs_interface.c:2021 msgid "Confirm selected action" msgstr "Gewählte Aktion bestätigen" -#: src/sid/xmms-sid.glade:3909 src/sid/xs_interface.c:2038 +#: src/sid/xmms-sid.glade:3909 +#: src/sid/xs_interface.c:2038 msgid "Yes" msgstr "Ja" -#: src/sid/xmms-sid.glade:3921 src/sid/xs_interface.c:2044 +#: src/sid/xmms-sid.glade:3921 +#: src/sid/xs_interface.c:2044 msgid "No" msgstr "Nein" -#: src/sid/xs_about.c:84 src/wma/wma.c:130 +#: src/sid/xs_about.c:84 +#: src/wma/wma.c:130 #, c-format msgid "About %s" msgstr "Über %s" @@ -4297,15 +4435,11 @@ msgstr "" #: src/sid/xs_sidplay1.cc:291 -msgid "" -"[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, report " -"to XMMS-SID author.\n" +msgid "[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, report to XMMS-SID author.\n" msgstr "" #: src/sid/xs_sidplay1.cc:296 -msgid "" -"[SIDPlay1] SID-tune status check failed. This should not happen, report to " -"XMMS-SID author.\n" +msgid "[SIDPlay1] SID-tune status check failed. This should not happen, report to XMMS-SID author.\n" msgstr "" #: src/sid/xs_sidplay2.cc:101 @@ -4438,8 +4572,10 @@ msgid "Command to run when Audacious starts a new song." msgstr "Auszuführender Befehl, wenn Audacious ein neues Lied startet." -#: src/song_change/song_change.c:332 src/song_change/song_change.c:354 -#: src/song_change/song_change.c:375 src/song_change/song_change.c:396 +#: src/song_change/song_change.c:332 +#: src/song_change/song_change.c:354 +#: src/song_change/song_change.c:375 +#: src/song_change/song_change.c:396 msgid "Command:" msgstr "Befehl:" @@ -4452,8 +4588,7 @@ msgstr "" #: src/song_change/song_change.c:387 -msgid "" -"Command to run when title changes for a song (i.e. network streams titles)." +msgid "Command to run when title changes for a song (i.e. network streams titles)." msgstr "" #: src/song_change/song_change.c:408 @@ -4474,9 +4609,7 @@ msgstr "" #: src/song_change/song_change.c:433 -msgid "" -"Parameters passed to the shell should be encapsulated in " -"quotes. Doing otherwise is a security risk." +msgid "Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk." msgstr "" #: src/spectrum/spectrum.c:90 @@ -4650,8 +4783,7 @@ "Sinuston-Generator von Haavard Kvaalen \n" "Verändert von Daniel J. Peng \n" "\n" -"Um ihn zu benützen, eine URL hinzufügen: tone://frequency1;frequency2;" -"frequency3;...\n" +"Um ihn zu benützen, eine URL hinzufügen: tone://frequency1;frequency2;frequency3;...\n" "z.B. tone://2000;2005 für einen Ton mit 2000Hz und einen mit 2005Hz" #: src/tonegen/tonegen.c:168 @@ -4727,19 +4859,23 @@ msgid "Title format:" msgstr "Titelformat:" -#: src/vorbis/configure.c:162 src/wavpack/ui.cxx:500 +#: src/vorbis/configure.c:162 +#: src/wavpack/ui.cxx:500 msgid "ReplayGain Settings:" msgstr "ReplayGain-Einstellungen:" -#: src/vorbis/configure.c:180 src/wavpack/ui.cxx:518 +#: src/vorbis/configure.c:180 +#: src/wavpack/ui.cxx:518 msgid "ReplayGain Type:" msgstr "ReplayGain-Typ:" -#: src/vorbis/configure.c:191 src/wavpack/ui.cxx:529 +#: src/vorbis/configure.c:191 +#: src/wavpack/ui.cxx:529 msgid "use Track Gain/Peak" msgstr "Benutze Track Gain/Peak" -#: src/vorbis/configure.c:201 src/wavpack/ui.cxx:537 +#: src/vorbis/configure.c:201 +#: src/wavpack/ui.cxx:537 msgid "use Album Gain/Peak" msgstr "Benutze Album Gain/Peak" @@ -5360,7 +5496,8 @@ msgid "Failed to modify tag (close)" msgstr "Verändern des Tags fehlgeschlagen (Schließen)" -#: src/vorbis/fileinfo.c:321 src/vorbis/fileinfo.c:330 +#: src/vorbis/fileinfo.c:321 +#: src/vorbis/fileinfo.c:330 msgid "Failed to modify tag" msgstr "Verändern des Tags fehlgeschlagen" @@ -5416,24 +5553,30 @@ msgid " Ogg Vorbis Info " msgstr " Ogg-Vorbis-Informationen " -#: src/vorbis/fileinfo.c:838 src/vorbis/fileinfo.c:915 +#: src/vorbis/fileinfo.c:838 +#: src/vorbis/fileinfo.c:915 msgid "Bit rate:" msgstr "Bitrate:" -#: src/vorbis/fileinfo.c:851 src/vorbis/fileinfo.c:918 +#: src/vorbis/fileinfo.c:851 +#: src/vorbis/fileinfo.c:918 msgid "Sample rate:" msgstr "Abtastfrequenz:" -#: src/vorbis/fileinfo.c:877 src/vorbis/fileinfo.c:924 +#: src/vorbis/fileinfo.c:877 +#: src/vorbis/fileinfo.c:924 msgid "Length:" msgstr "Länge:" -#: src/vorbis/fileinfo.c:890 src/vorbis/fileinfo.c:927 +#: src/vorbis/fileinfo.c:890 +#: src/vorbis/fileinfo.c:927 msgid "File size:" msgstr "Dateigrösse:" -#: src/vorbis/fileinfo.c:916 src/vorbis/fileinfo.c:919 -#: src/vorbis/fileinfo.c:922 src/vorbis/fileinfo.c:925 +#: src/vorbis/fileinfo.c:916 +#: src/vorbis/fileinfo.c:919 +#: src/vorbis/fileinfo.c:922 +#: src/vorbis/fileinfo.c:925 #: src/vorbis/fileinfo.c:928 msgid "N/A" msgstr "K/A" @@ -5506,8 +5649,7 @@ #: src/vtx/about.c:24 msgid "" "Vortex file format player by Sashnov Alexander \n" -"Founded on original source in_vtx.dll by Roman Sherbakov \n" +"Founded on original source in_vtx.dll by Roman Sherbakov \n" "\n" "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n" "and other AY/YM music sites.\n" @@ -5515,11 +5657,9 @@ "Audacious implementation by Pavel Vymetalek " msgstr "" "Vortex-Dateiformat-Player von Sashnov Alexander \n" -"Gegründet auf dem Original-Quellcode in_vtx.dll von Roman Sherbakov " -"\n" +"Gegründet auf dem Original-Quellcode in_vtx.dll von Roman Sherbakov \n" "\n" -"Musik im vtx-Format kann gefunden werden auf http://vtx.microfor.ru/music." -"htm\n" +"Musik im vtx-Format kann gefunden werden auf http://vtx.microfor.ru/music.htm\n" "und anderen AY/YM-Musikseiten.\n" "\n" "Audacious-Implementierung von Pavel Vymetalek " @@ -5661,9 +5801,8 @@ #: src/wma/wma.c:132 msgid "" "Adapted for use in Audacious by Tony Vroon (chainsaw@gentoo.org) from\n" -"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka " -"McMCC (mcmcc@mail.ru)\n" -"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy " -".\n" +"the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n" +"and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy .\n" "This plugin based on source code " msgstr "" + diff -r c162b6a0f11f -r 3aa95f65c24d po/ja.po --- a/po/ja.po Sat Oct 27 07:25:40 2007 -0500 +++ b/po/ja.po Sat Oct 27 07:26:32 2007 -0500 @@ -14,7 +14,7 @@ "Project-Id-Version: audacious-plugins HEAD\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2007-10-18 21:38+0200\n" -"PO-Revision-Date: 2007-09-10 09:42+0900\n" +"PO-Revision-Date: 2007-10-21 18:38+0900\n" "Last-Translator: dai \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -2894,12 +2894,11 @@ #: src/flacng/plugin.c:724 msgid "About FLAC Audio Plugin" -msgstr "FLAC オーディオ プラグインについて" +msgstr "FLAC オーディオプラグインについて" #: src/gnomeshortcuts/gnomeshortcuts.c:285 -#, fuzzy msgid "About Gnome Shortcut Plugin" -msgstr "ESounD プラグインについて" +msgstr "Gnome ショートカットプラグインについて" #: src/gnomeshortcuts/gnomeshortcuts.c:286 msgid "" @@ -2909,107 +2908,99 @@ "Copyright (C) 2007 Sascha Hlusiak \n" "\n" msgstr "" +"Gnome ショートカットプラグイン\n" +"Gnome ショートカットでプレイヤを操作しよう．\n" +"\n" +"Copyright (C) 2007 Sascha Hlusiak \n" +"\n" #: src/hotkey/plugin.c:607 -#, fuzzy msgid "(none)" -msgstr "なし" +msgstr "(なし)" #: src/hotkey/plugin.c:752 -#, fuzzy msgid "Global Hotkey Plugin Configuration" -msgstr "jack プラグイン設定" +msgstr "グローバルホットキープラグイン設定" #: src/hotkey/plugin.c:768 msgid "Press a key combination inside a text field." -msgstr "" +msgstr "テキストフィールド内でキーコンビネーションを押してください." #: src/hotkey/plugin.c:773 -#, fuzzy msgid "Playback:" -msgstr "演奏" +msgstr "演奏:" #: src/hotkey/plugin.c:788 msgid "Configure keys which controls Audacious playback." -msgstr "" +msgstr "Audacious の演奏を制御するキーを設定します." #: src/hotkey/plugin.c:795 msgid "Previous Track:" -msgstr "" +msgstr "次のトラック:" #: src/hotkey/plugin.c:798 -#, fuzzy msgid "Play/Pause:" -msgstr "演奏->一時停止" +msgstr "演奏/一時停止:" #: src/hotkey/plugin.c:801 -#, fuzzy msgid "Pause:" -msgstr "演奏停止" +msgstr "一時停止:" #: src/hotkey/plugin.c:804 -#, fuzzy msgid "Stop:" -msgstr " -> " +msgstr "演奏停止:" #: src/hotkey/plugin.c:807 -#, fuzzy msgid "Next Track:" -msgstr "トラック:" +msgstr "次のトラック:" #: src/hotkey/plugin.c:810 msgid "Forward 5 sec.:" -msgstr "" +msgstr "5秒進める:" #: src/hotkey/plugin.c:813 msgid "Rewind 5 sec.:" -msgstr "" +msgstr "5秒戻す:" #: src/hotkey/plugin.c:818 -#, fuzzy msgid "Volume Control:" -msgstr "音量コントロールデバイス:" +msgstr "音量コントロール:" #: src/hotkey/plugin.c:833 msgid "Configure keys which controls music volume." -msgstr "" +msgstr "曲の音量をコントロールするキーを設定します." #: src/hotkey/plugin.c:841 -#, fuzzy msgid "Mute:" -msgstr "日付:" +msgstr "無音:" #: src/hotkey/plugin.c:844 -#, fuzzy msgid "Volume Up:" -msgstr "音量" +msgstr "音量を上げる:" #: src/hotkey/plugin.c:847 -#, fuzzy msgid "Volume Down:" -msgstr "音量->5下げる" +msgstr "音量を下げる:" #: src/hotkey/plugin.c:852 -#, fuzzy msgid "Player:" -msgstr "名前:" +msgstr "プレイヤ:" #: src/hotkey/plugin.c:867 msgid "Configure keys which control the player." -msgstr "" +msgstr "プレイヤをコントロールするキーを設定します." #: src/hotkey/plugin.c:873 msgid "Jump to File:" -msgstr "" +msgstr "指定ファイルへ移動:" #: src/hotkey/plugin.c:876 msgid "Toggle Player Windows:" -msgstr "" +msgstr "プレイヤウィンドウを切り替える:" #: src/hotkey/plugin.c:903 -#, fuzzy msgid "About Global Hotkey Plugin" -msgstr "Scrobbler プラグインについて" +msgstr "グローバルホットキープラグインについて" #: src/hotkey/plugin.c:904 msgid "" @@ -3026,6 +3017,18 @@ "\t\t\tJeremy Tan \n" "\n" msgstr "" +"グローバルホットキープラグイン\n" +"グローバルキーコンビネーションかマルチメディアキーでプレイヤをコントロール.\n" +"\n" +"Copyright (C) 2007 Sascha Hlusiak \n" +"\n" +"貢献者:\n" +"Copyright (C) 2006 - 2007 Vladimir Paskov \n" +"Copyright (C) 2000-2002 Ville Syrjälä \n" +"\t\t\tBryn Davies \n" +"\t\t\tJonathan A. Davis \n" +"\t\t\tJeremy Tan \n" +"\n" #: src/jack/configure.c:70 msgid "Connect to all available jack ports" @@ -3546,14 +3549,14 @@ msgstr "サラウンド" #: src/modplug/gui/interface.cxx:550 src/modplug/gui/modplug.glade:1163 -#, fuzzy msgid "" "Note: Setting the preamp\n" "too high may cause clipping\n" "(annoying clicks and pops)!" msgstr "" "注意: プリアンプの設定が高すぎると\n" -"クリッピングや歪みの原因になります!" +"クリッピング(うるさいカチカチ音や\n" +"ブツブツ音)の原因になります!" #: src/modplug/gui/interface.cxx:556 src/modplug/gui/modplug.glade:1192 msgid "Preamp" @@ -3640,6 +3643,16 @@ "---\n" "---" msgstr "" +"---\n" +"---\n" +"---\n" +"---\n" +"---\n" +"---\n" +"---\n" +"---\n" +"---\n" +"---" #: src/modplug/gui/interface.cxx:901 src/modplug/gui/modplug.glade:1849 msgid "Samples" @@ -4520,30 +4533,32 @@ "for SID-files. The SID-plugin specific Tuplez tags are described shortly " "below." msgstr "" +"このオプションを有効にすると，SID ファイルのカスタムタプルフォーマット文字列" +"を指定できます．SID プラグインで指定するタプルタグはすぐ下に記述します．" #: src/sid/xmms-sid.glade:2432 src/sid/xs_interface.c:1039 -#, fuzzy msgid "Override generic Tuplez format string" -msgstr "オリジナルのタイトルを上書きする" +msgstr "オリジナルのタプルフォーマット文字列を上書きする" #: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1054 msgid "Tuplez format string for SID-files" -msgstr "" +msgstr "SID ファイルのタプルフォーマット文字列" #: src/sid/xmms-sid.glade:2477 src/sid/xs_interface.c:1057 msgid "Descriptions of SID-specific Tuplez fields go here. :D" -msgstr "" +msgstr "SID 特有のタプルフィールドはここに記載されます．:D" #: src/sid/xmms-sid.glade:2511 src/sid/xs_interface.c:1065 -#, fuzzy msgid "Song title format:" -msgstr "曲名/タイトルの書式:" +msgstr "曲のタイトルの書式:" #: src/sid/xmms-sid.glade:2584 src/sid/xs_interface.c:1096 msgid "" "If enabled, sub-tunes of each file will be added to playlist. If disabled, " "only the default sub-tune will be added." msgstr "" +"有効にすると，各ファイルのサブチューンがプレイリストに追加されます．" +"無効にすると，デフォルトのサブチューンのみが追加されます．" #: src/sid/xmms-sid.glade:2586 src/sid/xs_interface.c:1092 msgid "Add sub-tunes to playlist" @@ -4551,10 +4566,9 @@ #: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1102 msgid "Only add sub-tunes that have a duration of at least specified time." -msgstr "" +msgstr "少なくとも指定された時間の持続時間を持ったサブチューンのみ追加します．" #: src/sid/xmms-sid.glade:2607 src/sid/xs_interface.c:1098 -#, fuzzy msgid "Only tunes with specified minimum duration" msgstr "指定された最小の長さのチューンのみ" @@ -4693,11 +4707,11 @@ #: src/sid/xs_config.c:580 msgid "Allocation of sid2FilterPresets structure failed!\n" -msgstr "" +msgstr "sid2FilterPresets 構造体の割り当てに失敗しました!\n" #: src/sid/xs_config.c:908 msgid "Warning: Could not set filter curve widget points!\n" -msgstr "" +msgstr "警告: フィルタ曲線の分点がセットできませんでした!\n" #: src/sid/xs_fileinfo.c:232 msgid "General info" diff -r c162b6a0f11f -r 3aa95f65c24d src/CoreAudio/configure.c --- a/src/CoreAudio/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/CoreAudio/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -62,18 +62,18 @@ if (osx_cfg.alt_mixer_device[0] != '/') osx_cfg.use_alt_mixer_device = FALSE; - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device); - bmp_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device); - bmp_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size); - bmp_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer); - bmp_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master); - bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device); - bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device); - bmp_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device); + aud_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device); + aud_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size); + aud_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer); + aud_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master); + aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device); + aud_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device); + aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device); + aud_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device); + aud_cfg_db_close(cfgfile); gtk_widget_destroy(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/CoreAudio/init.c --- a/src/CoreAudio/init.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/CoreAudio/init.c Sat Oct 27 07:26:32 2007 -0500 @@ -39,17 +39,17 @@ osx_cfg.alt_audio_device = NULL; osx_cfg.use_master=0; - if ((cfgfile = bmp_cfg_db_open())) + if ((cfgfile = aud_cfg_db_open())) { - bmp_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device); - bmp_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device); - bmp_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size); - bmp_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device); - bmp_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device); + aud_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device); + aud_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size); + aud_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device); + aud_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device); + aud_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device); + aud_cfg_db_close(cfgfile); } } diff -r c162b6a0f11f -r 3aa95f65c24d src/OSS/configure.c --- a/src/OSS/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/OSS/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -73,22 +73,22 @@ if (oss_cfg.alt_mixer_device[0] != '/') oss_cfg.use_alt_mixer_device = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); - bmp_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device); - bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); - bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); - bmp_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", + aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); + aud_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device); + aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); + aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); + aud_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master); + aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", oss_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(db, "OSS", "alt_audio_device", + aud_cfg_db_set_string(db, "OSS", "alt_audio_device", oss_cfg.alt_audio_device); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device", + aud_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device", oss_cfg.use_alt_mixer_device); - bmp_cfg_db_set_string(db, "OSS", "alt_mixer_device", + aud_cfg_db_set_string(db, "OSS", "alt_mixer_device", oss_cfg.alt_mixer_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void diff -r c162b6a0f11f -r 3aa95f65c24d src/OSS/init.c --- a/src/OSS/init.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/OSS/init.c Sat Oct 27 07:26:32 2007 -0500 @@ -42,20 +42,20 @@ oss_cfg.alt_audio_device = NULL; oss_cfg.use_master = 0; - if ((db = bmp_cfg_db_open())) { - bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); - bmp_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device); - bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); - bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); - bmp_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", + if ((db = aud_cfg_db_open())) { + aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); + aud_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device); + aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); + aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); + aud_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master); + aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", &oss_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(db, "OSS", "alt_audio_device", + aud_cfg_db_get_string(db, "OSS", "alt_audio_device", &oss_cfg.alt_audio_device); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device", + aud_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device", &oss_cfg.use_alt_mixer_device); - bmp_cfg_db_get_string(db, "OSS", "alt_mixer_device", + aud_cfg_db_get_string(db, "OSS", "alt_mixer_device", &oss_cfg.alt_mixer_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } } diff -r c162b6a0f11f -r 3aa95f65c24d src/OSS4/OSS4.c --- a/src/OSS4/OSS4.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/OSS4/OSS4.c Sat Oct 27 07:26:32 2007 -0500 @@ -53,9 +53,9 @@ void oss_cleanup(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "saved_volume", vol); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "OSS", "saved_volume", vol); + aud_cfg_db_close(db); if (oss_cfg.alt_audio_device) { free(oss_cfg.alt_audio_device); diff -r c162b6a0f11f -r 3aa95f65c24d src/OSS4/configure.c --- a/src/OSS4/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/OSS4/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -63,17 +63,17 @@ if (oss_cfg.alt_audio_device[0] != '/') oss_cfg.use_alt_audio_device = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); - bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); - bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); - bmp_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", + aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); + aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); + aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); + aud_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume); + aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", oss_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(db, "OSS", "alt_audio_device", + aud_cfg_db_set_string(db, "OSS", "alt_audio_device", oss_cfg.alt_audio_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void diff -r c162b6a0f11f -r 3aa95f65c24d src/OSS4/init.c --- a/src/OSS4/init.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/OSS4/init.c Sat Oct 27 07:26:32 2007 -0500 @@ -40,17 +40,17 @@ oss_cfg.use_alt_audio_device = FALSE; oss_cfg.alt_audio_device = NULL; - if ((db = bmp_cfg_db_open())) { - bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); - bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); - bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); - bmp_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", + if ((db = aud_cfg_db_open())) { + aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); + aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); + aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); + aud_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume); + aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", &oss_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(db, "OSS", "alt_audio_device", + aud_cfg_db_get_string(db, "OSS", "alt_audio_device", &oss_cfg.alt_audio_device); - bmp_cfg_db_get_int(db, "OSS", "saved_volume", &vol); - bmp_cfg_db_close(db); + aud_cfg_db_get_int(db, "OSS", "saved_volume", &vol); + aud_cfg_db_close(db); } //volume gets saved anyway, but is ignored unless "saved_volume" is true if(!oss_cfg.save_volume) diff -r c162b6a0f11f -r 3aa95f65c24d src/adplug/adplug-xmms.cc --- a/src/adplug/adplug-xmms.cc Sat Oct 27 07:25:40 2007 -0500 +++ b/src/adplug/adplug-xmms.cc Sat Oct 27 07:26:32 2007 -0500 @@ -1036,14 +1036,14 @@ adplug_init (void) { dbg_printf ("adplug_init(): open, "); - ConfigDb *db = bmp_cfg_db_open (); + ConfigDb *db = aud_cfg_db_open (); // Read configuration dbg_printf ("read, "); - bmp_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16); - bmp_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo); - bmp_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq); - bmp_cfg_db_get_bool (db, CFG_VERSION, "Endless", + aud_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16); + aud_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo); + aud_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq); + aud_cfg_db_get_bool (db, CFG_VERSION, "Endless", (gboolean *) & conf.endless); // Read file type exclusion list @@ -1052,7 +1052,7 @@ gchar *cfgstr = NULL, *exclude = NULL; gboolean cfgread; - cfgread = bmp_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr); + cfgread = aud_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr); if (cfgread) { exclude = (char *) malloc (strlen (cfgstr) + 2); strcpy (exclude, cfgstr); @@ -1063,7 +1063,7 @@ free (exclude); free (cfgstr); } } - bmp_cfg_db_close (db); + aud_cfg_db_close (db); // Load database from disk and hand it to AdPlug dbg_printf ("database"); @@ -1088,7 +1088,7 @@ adplug_quit (void) { dbg_printf ("adplug_quit(): open, "); - ConfigDb *db = bmp_cfg_db_open (); + ConfigDb *db = aud_cfg_db_open (); // Close database dbg_printf ("db, "); @@ -1097,10 +1097,10 @@ // Write configuration dbg_printf ("write, "); - bmp_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16); - bmp_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo); - bmp_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq); - bmp_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless); + aud_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16); + aud_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo); + aud_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq); + aud_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless); dbg_printf ("exclude, "); std::string exclude; @@ -1114,11 +1114,11 @@ exclude += (*i)->filetype; } gchar *cfgval = g_strdup (exclude.c_str ()); - bmp_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval); + aud_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval); free (cfgval); dbg_printf ("close"); - bmp_cfg_db_close (db); + aud_cfg_db_close (db); dbg_printf (".\n"); } diff -r c162b6a0f11f -r 3aa95f65c24d src/alarm/alarm.c --- a/src/alarm/alarm.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/alarm/alarm.c Sat Oct 27 07:26:32 2007 -0500 @@ -177,18 +177,18 @@ DEBUG("alarm_save\n"); - conf = bmp_cfg_db_open(); + conf = aud_cfg_db_open(); /* * update the live values and write them out */ alarm_h = alarm_conf.default_hour = gtk_spin_button_get_value_as_int(alarm_conf.alarm_h); - bmp_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h); + aud_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h); alarm_m = alarm_conf.default_min = gtk_spin_button_get_value_as_int(alarm_conf.alarm_m); - bmp_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m); + aud_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m); stop_h = @@ -216,20 +216,20 @@ alarm_conf.day[daynum].min = gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min); - bmp_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags); - bmp_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour); - bmp_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min); + aud_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags); + aud_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour); + aud_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min); } /* END: days of week */ volume = gtk_range_get_adjustment(alarm_conf.volume)->value; - bmp_cfg_db_set_int(conf, "alarm", "volume", volume); + aud_cfg_db_set_int(conf, "alarm", "volume", volume); quietvol = gtk_range_get_adjustment(alarm_conf.quietvol)->value; - bmp_cfg_db_set_int(conf, "alarm", "quietvol", quietvol); + aud_cfg_db_set_int(conf, "alarm", "quietvol", quietvol); fading = gtk_spin_button_get_value_as_int(alarm_conf.fading); @@ -252,38 +252,38 @@ else { /* write the new values */ - bmp_cfg_db_set_int(conf, "alarm", "stop_h", stop_h); - bmp_cfg_db_set_int(conf, "alarm", "stop_m", stop_m); - bmp_cfg_db_set_int(conf, "alarm", "fading", fading); - bmp_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on); + aud_cfg_db_set_int(conf, "alarm", "stop_h", stop_h); + aud_cfg_db_set_int(conf, "alarm", "stop_m", stop_m); + aud_cfg_db_set_int(conf, "alarm", "fading", fading); + aud_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on); } g_free(cmdstr); cmdstr = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.cmdstr), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr); + aud_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr); cmd_on = gtk_toggle_button_get_active(alarm_conf.cmd_on); - bmp_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on); + aud_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on); g_free(playlist); playlist = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.playlist), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "playlist", playlist); + aud_cfg_db_set_string(conf, "alarm", "playlist", playlist); /* reminder */ g_free(alarm_conf.reminder_msg); alarm_conf.reminder_msg = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.reminder), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg); + aud_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg); alarm_conf.reminder_on = gtk_toggle_button_get_active(alarm_conf.reminder_cb); - bmp_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on); + aud_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on); - bmp_cfg_db_close(conf); + aud_cfg_db_close(conf); } /* @@ -296,50 +296,50 @@ DEBUG("alarm_read_config\n"); - conf = bmp_cfg_db_open(); + conf = aud_cfg_db_open(); - if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h)) + if(!aud_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h)) alarm_h = DEFAULT_ALARM_HOUR; - if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m)) + if(!aud_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m)) alarm_m = DEFAULT_ALARM_MIN; /* save them here too */ alarm_conf.default_hour = alarm_h; alarm_conf.default_min = alarm_m; - if(!bmp_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h)) + if(!aud_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h)) stop_h = DEFAULT_STOP_HOURS; - if(!bmp_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m)) + if(!aud_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m)) stop_m = DEFAULT_STOP_MINS; - if(!bmp_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on)) stop_on = TRUE; - if(!bmp_cfg_db_get_int(conf, "alarm", "volume", &volume)) + if(!aud_cfg_db_get_int(conf, "alarm", "volume", &volume)) volume = DEFAULT_VOLUME; - if(!bmp_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol)) + if(!aud_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol)) quietvol = DEFAULT_QUIET_VOL; - if(!bmp_cfg_db_get_int(conf, "alarm", "fading", &fading)) + if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading)) fading = DEFAULT_FADING; - if(!bmp_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr)) + if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr)) cmdstr = g_strdup(""); - if(!bmp_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on)) cmd_on = FALSE; - if(!bmp_cfg_db_get_string(conf, "alarm", "playlist", &playlist)) + if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist)) playlist = g_strdup(""); - if(!bmp_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg)) + if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg)) alarm_conf.reminder_msg = g_strdup(""); - if(!bmp_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on)) alarm_conf.reminder_on = FALSE; /* day flags and times */ for(; daynum < 7; daynum++) { /* read the flags */ - if(!bmp_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) { + if(!aud_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) { // only turn alarm off by default on a sunday if(daynum != 0) alarm_conf.day[daynum].flags = DEFAULT_FLAGS; @@ -348,10 +348,10 @@ } /* read the times */ - if(!bmp_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour)) + if(!aud_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour)) alarm_conf.day[daynum].hour = DEFAULT_ALARM_HOUR; - if(!bmp_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min)) + if(!aud_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min)) alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN; } diff -r c162b6a0f11f -r 3aa95f65c24d src/alsa/configure.c --- a/src/alsa/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/alsa/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -46,16 +46,16 @@ void alsa_save_config(void) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time); - bmp_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time); - bmp_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); - bmp_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); - bmp_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); - bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left); - bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time); + aud_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time); + aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); + aud_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); + aud_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); + aud_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left); + aud_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right); + aud_cfg_db_close(cfgfile); } static int get_cards(GtkOptionMenu *omenu, GtkSignalFunc cb, int active) diff -r c162b6a0f11f -r 3aa95f65c24d src/alsa/init.c --- a/src/alsa/init.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/alsa/init.c Sat Oct 27 07:26:32 2007 -0500 @@ -35,20 +35,20 @@ alsa_cfg.vol.left = 100; alsa_cfg.vol.right = 100; - cfgfile = bmp_cfg_db_open(); - if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "pcm_device", + cfgfile = aud_cfg_db_open(); + if (!aud_cfg_db_get_string(cfgfile, "ALSA", "pcm_device", &alsa_cfg.pcm_device)) alsa_cfg.pcm_device = g_strdup("default"); g_message("device: %s", alsa_cfg.pcm_device); - if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "mixer_device", + if (!aud_cfg_db_get_string(cfgfile, "ALSA", "mixer_device", &alsa_cfg.mixer_device)) alsa_cfg.mixer_device = g_strdup("PCM"); - bmp_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); - bmp_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); - bmp_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); + aud_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); + aud_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); + aud_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); - bmp_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug); + aud_cfg_db_close(cfgfile); if (dlopen("libasound.so.2", RTLD_NOW | RTLD_GLOBAL) == NULL) { diff -r c162b6a0f11f -r 3aa95f65c24d src/aosd/aosd_cfg.c --- a/src/aosd/aosd_cfg.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/aosd/aosd_cfg.c Sat Oct 27 07:26:32 2007 -0500 @@ -222,42 +222,42 @@ gint aosd_cfg_load ( aosd_cfg_t * cfg ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); gint i = 0; gint max_numcol; gchar *trig_active_str; /* position */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_placement" , &(cfg->osd->position.placement) ) ) cfg->osd->position.placement = AOSD_POSITION_PLACEMENT_TOPLEFT; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_offset_x" , &(cfg->osd->position.offset_x) ) ) cfg->osd->position.offset_x = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_offset_y" , &(cfg->osd->position.offset_y) ) ) cfg->osd->position.offset_y = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_maxsize_width" , &(cfg->osd->position.maxsize_width) ) ) cfg->osd->position.maxsize_width = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_multimon_id" , &(cfg->osd->position.multimon_id) ) ) cfg->osd->position.multimon_id = -1; /* animation */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_display" , &(cfg->osd->animation.timing_display) ) ) cfg->osd->animation.timing_display = 3000; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_fadein" , &(cfg->osd->animation.timing_fadein) ) ) cfg->osd->animation.timing_fadein = 300; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_fadeout" , &(cfg->osd->animation.timing_fadeout) ) ) cfg->osd->animation.timing_fadeout = 300; @@ -267,38 +267,38 @@ gchar *color_str = NULL; gchar *key_str = NULL; key_str = g_strdup_printf( "text_fonts_name_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) ) cfg->osd->text.fonts_name[i] = g_strdup( "Sans 26" ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) color_str = g_strdup( "65535,65535,65535,65535" ); /* white , alpha 100% */ aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_color[i]) ); g_free( key_str ); g_free( color_str ); key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i ); - if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) ) + if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) ) cfg->osd->text.fonts_draw_shadow[i] = TRUE; g_free( key_str ); key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) color_str = g_strdup( "0,0,0,32767" ); /* black , alpha 50% */ aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_shadow_color[i]) ); g_free( key_str ); g_free( color_str ); } - if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" , + if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , "text_utf8conv_disable" , &(cfg->osd->text.utf8conv_disable) ) ) cfg->osd->text.utf8conv_disable = FALSE; /* decoration */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "decoration_code" , &(cfg->osd->decoration.code) ) ) cfg->osd->decoration.code = aosd_deco_style_get_first_code(); /* TODO not implemented yet - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "decoration_skin_file" , &(cfg->osd->decoration.skin_file) ) ) cfg->osd->decoration.skin_file = g_strdup( "" ); */ @@ -311,7 +311,7 @@ gchar *color_str = NULL; aosd_color_t color; key_str = g_strdup_printf( "decoration_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) { /* we have different default values for the decoration colors */ switch ( i ) @@ -335,7 +335,7 @@ } /* trigger */ - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) ) { gint trig_active_defval = 0; g_array_append_val( cfg->osd->trigger.active , trig_active_defval ); @@ -354,11 +354,11 @@ } /* miscellanous */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "transparency_mode" , &(cfg->osd->misc.transparency_mode) ) ) cfg->osd->misc.transparency_mode = AOSD_MISC_TRANSPARENCY_FAKE; - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); /* the config object has been filled with information */ cfg->set = TRUE; @@ -370,7 +370,7 @@ gint aosd_cfg_save ( aosd_cfg_t * cfg ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); gint i = 0; gint max_numcol; GString *string = g_string_new( "" ); @@ -379,29 +379,29 @@ return -1; /* position */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_placement" , cfg->osd->position.placement ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_offset_x" , cfg->osd->position.offset_x ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_offset_y" , cfg->osd->position.offset_y ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_maxsize_width" , cfg->osd->position.maxsize_width ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_multimon_id" , cfg->osd->position.multimon_id ); /* animation */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_display" , cfg->osd->animation.timing_display ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_fadein" , cfg->osd->animation.timing_fadein ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_fadeout" , cfg->osd->animation.timing_fadeout ); /* text */ @@ -410,36 +410,36 @@ gchar *color_str = NULL; gchar *key_str = NULL; key_str = g_strdup_printf( "text_fonts_name_%i" , i ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , cfg->osd->text.fonts_name[i] ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_color_%i" , i ); aosd_cfg_util_color_to_str( cfg->osd->text.fonts_color[i] , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i ); - bmp_cfg_db_set_bool( cfgfile , "aosd" , + aud_cfg_db_set_bool( cfgfile , "aosd" , key_str , cfg->osd->text.fonts_draw_shadow[i] ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i ); aosd_cfg_util_color_to_str( cfg->osd->text.fonts_shadow_color[i] , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); } - bmp_cfg_db_set_bool( cfgfile , "aosd" , + aud_cfg_db_set_bool( cfgfile , "aosd" , "text_utf8conv_disable" , cfg->osd->text.utf8conv_disable ); /* decoration */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "decoration_code" , cfg->osd->decoration.code ); /* TODO skip this since it's not implemented yet - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , "decoration_skin_file" , cfg->osd->decoration.skin_file ); */ /* decoration - colors */ @@ -451,7 +451,7 @@ aosd_color_t color = g_array_index( cfg->osd->decoration.colors , aosd_color_t , i ); key_str = g_strdup_printf( "decoration_color_%i" , i ); aosd_cfg_util_color_to_str( color , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); @@ -464,14 +464,14 @@ g_string_truncate( string , string->len - 1 ); else g_string_assign( string , "x" ); - bmp_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str ); + aud_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str ); g_string_free( string , TRUE ); /* miscellaneous */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "transparency_mode" , cfg->osd->misc.transparency_mode ); - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return 0; } diff -r c162b6a0f11f -r 3aa95f65c24d src/arts/audio.c --- a/src/arts/audio.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/arts/audio.c Sat Oct 27 07:26:32 2007 -0500 @@ -62,10 +62,10 @@ artsxmms_cfg.buffer_size = 400; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "arts", "buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "arts", "buffer_size", &artsxmms_cfg.buffer_size); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } diff -r c162b6a0f11f -r 3aa95f65c24d src/arts/configure.c --- a/src/arts/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/arts/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -23,9 +23,9 @@ artsxmms_cfg.buffer_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_spin)); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/audiocompress/audacious-glue.c --- a/src/audiocompress/audacious-glue.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/audiocompress/audacious-glue.c Sat Oct 27 07:26:32 2007 -0500 @@ -122,20 +122,20 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_bool(db, "AudioCompress", + aud_cfg_db_get_bool(db, "AudioCompress", "anticlip", &prefs->anticlip); - bmp_cfg_db_get_int(db, "AudioCompress", "target", + aud_cfg_db_get_int(db, "AudioCompress", "target", &prefs->target); - bmp_cfg_db_get_int(db, "AudioCompress", "gainmax", + aud_cfg_db_get_int(db, "AudioCompress", "gainmax", &prefs->gainmax); - bmp_cfg_db_get_int(db, "AudioCompress", + aud_cfg_db_get_int(db, "AudioCompress", "gainsmooth", &prefs->gainsmooth); - bmp_cfg_db_get_int(db, "AudioCompress", "buckets", + aud_cfg_db_get_int(db, "AudioCompress", "buckets", &prefs->buckets); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); if ((prefs->gainmax == 0) && (prefs->gainsmooth == 0) && (prefs->buckets == 0)) { prefs->anticlip = ANTICLIP; @@ -161,20 +161,20 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "AudioCompress", "anticlip", + aud_cfg_db_set_bool(db, "AudioCompress", "anticlip", prefs->anticlip); - bmp_cfg_db_set_int(db, "AudioCompress", "target", + aud_cfg_db_set_int(db, "AudioCompress", "target", prefs->target); - bmp_cfg_db_set_int(db, "AudioCompress", "gainmax", + aud_cfg_db_set_int(db, "AudioCompress", "gainmax", prefs->gainmax); - bmp_cfg_db_set_int(db, "AudioCompress", "gainsmooth", + aud_cfg_db_set_int(db, "AudioCompress", "gainsmooth", prefs->gainsmooth); - bmp_cfg_db_set_int(db, "AudioCompress", "buckets", + aud_cfg_db_set_int(db, "AudioCompress", "buckets", prefs->buckets); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } diff -r c162b6a0f11f -r 3aa95f65c24d src/blur_scope/blur_scope.c --- a/src/blur_scope/blur_scope.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/blur_scope/blur_scope.c Sat Oct 27 07:26:32 2007 -0500 @@ -99,12 +99,12 @@ if (!config_read) { bscope_cfg.color = 0xFF3F7F; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if (db) { - bmp_cfg_db_get_int(db, "BlurScope", "color", + aud_cfg_db_get_int(db, "BlurScope", "color", (int *) &bscope_cfg.color); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } config_read = TRUE; } diff -r c162b6a0f11f -r 3aa95f65c24d src/blur_scope/config.c --- a/src/blur_scope/config.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/blur_scope/config.c Sat Oct 27 07:26:32 2007 -0500 @@ -25,9 +25,9 @@ bscope_cfg.color = ((guint32) (255.0 * color[0]) << 16) | ((guint32) (255.0 * color[1]) << 8) | ((guint32) (255.0 * color[2])); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color); + aud_cfg_db_close(db); generate_cmap(); gtk_widget_destroy(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/console/Audacious_Config.cxx --- a/src/console/Audacious_Config.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/console/Audacious_Config.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -21,31 +21,31 @@ void console_cfg_load( void ) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length); - bmp_cfg_db_get_bool(db, "console", "resample", &audcfg.resample); - bmp_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate); - bmp_cfg_db_get_int(db, "console", "treble", &audcfg.treble); - bmp_cfg_db_get_int(db, "console", "bass", &audcfg.bass); - bmp_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length); - bmp_cfg_db_get_int(db, "console", "echo", &audcfg.echo); - bmp_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb); - bmp_cfg_db_close(db); + ConfigDb *db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length); + aud_cfg_db_get_bool(db, "console", "resample", &audcfg.resample); + aud_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate); + aud_cfg_db_get_int(db, "console", "treble", &audcfg.treble); + aud_cfg_db_get_int(db, "console", "bass", &audcfg.bass); + aud_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length); + aud_cfg_db_get_int(db, "console", "echo", &audcfg.echo); + aud_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb); + aud_cfg_db_close(db); } void console_cfg_save( void ) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length); - bmp_cfg_db_set_bool(db, "console", "resample", audcfg.resample); - bmp_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate); - bmp_cfg_db_set_int(db, "console", "treble", audcfg.treble); - bmp_cfg_db_set_int(db, "console", "bass", audcfg.bass); - bmp_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length); - bmp_cfg_db_set_int(db, "console", "echo", audcfg.echo); - bmp_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb); - bmp_cfg_db_close(db); + ConfigDb *db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length); + aud_cfg_db_set_bool(db, "console", "resample", audcfg.resample); + aud_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate); + aud_cfg_db_set_int(db, "console", "treble", audcfg.treble); + aud_cfg_db_set_int(db, "console", "bass", audcfg.bass); + aud_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length); + aud_cfg_db_set_int(db, "console", "echo", audcfg.echo); + aud_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb); + aud_cfg_db_close(db); } diff -r c162b6a0f11f -r 3aa95f65c24d src/echo_plugin/echo.c --- a/src/echo_plugin/echo.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/echo_plugin/echo.c Sat Oct 27 07:26:32 2007 -0500 @@ -47,12 +47,12 @@ if (sizeof(short) != sizeof(gint16)) abort(); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay); - bmp_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback); - bmp_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume); - bmp_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable); - bmp_cfg_db_close(cfg); + cfg = aud_cfg_db_open(); + aud_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay); + aud_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback); + aud_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume); + aud_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable); + aud_cfg_db_close(cfg); } static void cleanup(void) diff -r c162b6a0f11f -r 3aa95f65c24d src/echo_plugin/gui.c --- a/src/echo_plugin/gui.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/echo_plugin/gui.c Sat Oct 27 07:26:32 2007 -0500 @@ -39,12 +39,12 @@ echo_surround_enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(surround_btn)); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay); - bmp_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback); - bmp_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume); - bmp_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable); - bmp_cfg_db_close(cfg); + cfg = aud_cfg_db_open(); + aud_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay); + aud_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback); + aud_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume); + aud_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable); + aud_cfg_db_close(cfg); } static void conf_ok_cb(GtkButton * button, gpointer data) diff -r c162b6a0f11f -r 3aa95f65c24d src/esd/configure.c --- a/src/esd/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/esd/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -53,15 +53,15 @@ esd_cfg.prebuffer = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_pre_spin)); - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote); - bmp_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer); - bmp_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server); - bmp_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port); - bmp_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size); - bmp_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote); + aud_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer); + aud_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server); + aud_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port); + aud_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size); + aud_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer); + aud_cfg_db_close(db); } diff -r c162b6a0f11f -r 3aa95f65c24d src/esd/init.c --- a/src/esd/init.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/esd/init.c Sat Oct 27 07:26:32 2007 -0500 @@ -41,7 +41,7 @@ esd_cfg.buffer_size = 3000; esd_cfg.prebuffer = 25; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if ((env = getenv("ESPEAKER")) != NULL) { char *temp; @@ -56,20 +56,20 @@ } } else { - bmp_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote); - bmp_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server); - bmp_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port); + aud_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote); + aud_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server); + aud_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port); } - bmp_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer); - bmp_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size); - bmp_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer); + aud_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer); + aud_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size); + aud_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer); /* restore volume levels */ - bmp_cfg_db_get_int(db, "ESD", "volume_left", &lp); - bmp_cfg_db_get_int(db, "ESD", "volume_right", &rp); + aud_cfg_db_get_int(db, "ESD", "volume_left", &lp); + aud_cfg_db_get_int(db, "ESD", "volume_right", &rp); esdout_set_volume(lp, rp); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); if (!esd_cfg.server) esd_cfg.server = g_strdup("localhost"); diff -r c162b6a0f11f -r 3aa95f65c24d src/esd/mixer.c --- a/src/esd/mixer.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/esd/mixer.c Sat Oct 27 07:26:32 2007 -0500 @@ -160,10 +160,10 @@ } /* save volume values in db */ - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "ESD", "volume_left", lp); - bmp_cfg_db_set_int(db, "ESD", "volume_right", rp); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "ESD", "volume_left", lp); + aud_cfg_db_set_int(db, "ESD", "volume_right", rp); + aud_cfg_db_close(db); } #ifdef HAVE_OSS diff -r c162b6a0f11f -r 3aa95f65c24d src/filewriter/filewriter.c --- a/src/filewriter/filewriter.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/filewriter/filewriter.c Sat Oct 27 07:26:32 2007 -0500 @@ -136,14 +136,14 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "filewriter", "fileext", &fileext); - bmp_cfg_db_get_string(db, "filewriter", "file_path", &file_path); - bmp_cfg_db_get_bool(db, "filewriter", "save_original", &save_original); - bmp_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix); - bmp_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags); - bmp_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "filewriter", "fileext", &fileext); + aud_cfg_db_get_string(db, "filewriter", "file_path", &file_path); + aud_cfg_db_get_bool(db, "filewriter", "save_original", &save_original); + aud_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix); + aud_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags); + aud_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber); + aud_cfg_db_close(db); if (!file_path) file_path = g_strdup(g_get_home_dir()); @@ -383,15 +383,15 @@ prependnumber = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prependnumber_toggle)); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "filewriter", "fileext", fileext); - bmp_cfg_db_set_string(db, "filewriter", "file_path", file_path); - bmp_cfg_db_set_bool(db, "filewriter", "save_original", save_original); - bmp_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags); - bmp_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix); - bmp_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "filewriter", "fileext", fileext); + aud_cfg_db_set_string(db, "filewriter", "file_path", file_path); + aud_cfg_db_set_bool(db, "filewriter", "save_original", save_original); + aud_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags); + aud_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix); + aud_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); if (path_dirbrowser) diff -r c162b6a0f11f -r 3aa95f65c24d src/filewriter/mp3.c --- a/src/filewriter/mp3.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/filewriter/mp3.c Sat Oct 27 07:26:32 2007 -0500 @@ -160,40 +160,40 @@ static void mp3_init(void) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val", + ConfigDb *db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on); + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type); + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val", &enforce_min_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val", &vbr_quality_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val", &toggle_xing_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val", &mark_original_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val", &mark_copyright_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val", &algo_quality_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val", &out_samplerate_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val); - bmp_cfg_db_get_float(db, "filewriter_mp3", "compression_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val); + aud_cfg_db_get_float(db, "filewriter_mp3", "compression_val", &compression_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val", &enforce_iso_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val", &error_protect_val); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static gint mp3_open(void) @@ -619,37 +619,37 @@ if (vbr_min_val > vbr_max_val) vbr_max_val = vbr_min_val; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val", mark_original_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val", mark_copyright_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val", algo_quality_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val", out_samplerate_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val); - bmp_cfg_db_set_float(db, "filewriter_mp3", "compression_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val); + aud_cfg_db_set_float(db, "filewriter_mp3", "compression_val", compression_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val", error_protect_val); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); diff -r c162b6a0f11f -r 3aa95f65c24d src/filewriter/vorbis.c --- a/src/filewriter/vorbis.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/filewriter/vorbis.c Sat Oct 27 07:26:32 2007 -0500 @@ -63,11 +63,11 @@ static void vorbis_init(void) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality); + aud_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static gint vorbis_open(void) @@ -245,11 +245,11 @@ static void configure_ok_cb(gpointer data) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality); + aud_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_hide(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/hotkey/plugin.c --- a/src/hotkey/plugin.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/hotkey/plugin.c Sat Oct 27 07:26:32 2007 -0500 @@ -447,34 +447,34 @@ plugin_cfg.toggle_win_mask = 0; /* open configuration database */ - cfdb = bmp_cfg_db_open ( ); + cfdb = aud_cfg_db_open ( ); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute); + aud_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play); + aud_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause); + aud_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop); + aud_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track); + aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track); + aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file); + aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward); + aud_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward); + aud_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win); + aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask); - bmp_cfg_db_close (cfdb); + aud_cfg_db_close (cfdb); } /* save plugin configuration */ @@ -483,33 +483,33 @@ ConfigDb *cfdb; /* open configuration database */ - cfdb = bmp_cfg_db_open ( ); + cfdb = aud_cfg_db_open ( ); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask); - bmp_cfg_db_close (cfdb); + aud_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute); + aud_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play); + aud_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause); + aud_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop); + aud_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track); + aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track); + aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file); + aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward); + aud_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward); + aud_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win); + aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask); + aud_cfg_db_close (cfdb); } static int x11_error_handler (Display *dpy, XErrorEvent *error) diff -r c162b6a0f11f -r 3aa95f65c24d src/jack/configure.c --- a/src/jack/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/jack/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -53,11 +53,11 @@ jack_set_port_connection_mode(); /* update the connection mode */ - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled); - bmp_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled); + aud_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode); + aud_cfg_db_close(cfgfile); gtk_widget_destroy(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/jack/jack.c --- a/src/jack/jack.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/jack/jack.c Sat Oct 27 07:26:32 2007 -0500 @@ -196,7 +196,7 @@ /* read the isTraceEnabled setting from the config file */ ConfigDb *cfgfile; - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); if (!cfgfile) { jack_cfg.isTraceEnabled = FALSE; @@ -205,16 +205,16 @@ jack_cfg.volume_right = 25; } else { - bmp_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled); - if(!bmp_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode)) + aud_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled); + if(!aud_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode)) jack_cfg.port_connection_mode = "CONNECT_ALL"; - if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left)) + if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left)) jack_cfg.volume_left = 25; - if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right)) + if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right)) jack_cfg.volume_right = 25; } - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); TRACE("initializing\n"); @@ -274,10 +274,10 @@ { ConfigDb *cfgfile; - cfgfile = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */ - bmp_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right); - bmp_cfg_db_close(cfgfile); + cfgfile = aud_cfg_db_open(); + aud_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */ + aud_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right); + aud_cfg_db_close(cfgfile); TRACE("\n"); diff -r c162b6a0f11f -r 3aa95f65c24d src/ladspa/ladspa.c --- a/src/ladspa/ladspa.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/ladspa/ladspa.c Sat Oct 27 07:26:32 2007 -0500 @@ -144,29 +144,29 @@ ConfigDb *db; gint k, plugins= 0; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_int(db, "ladspa", "plugins", &plugins); + aud_cfg_db_get_int(db, "ladspa", "plugins", &plugins); for (k= 0; k < plugins; ++k) { gint id; int port, ports= 0; plugin_instance *instance; gchar *section = g_strdup_printf("ladspa_plugin%d", k); - bmp_cfg_db_get_int(db, section, "id", &id); + aud_cfg_db_get_int(db, section, "id", &id); instance = add_plugin(get_plugin_by_id(id)); if (!instance) continue; /* couldn't load this plugin */ - bmp_cfg_db_get_int(db, section, "ports", &ports); + aud_cfg_db_get_int(db, section, "ports", &ports); for (port= 0; port < ports && port < MAX_KNOBS; ++port) { gchar *key = g_strdup_printf("port%d", port); - bmp_cfg_db_get_float(db, section, key, &(instance->knobs[port])); + aud_cfg_db_get_float(db, section, key, &(instance->knobs[port])); } instance->restored = TRUE; g_free(section); } state.initialised = TRUE; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static ladspa_plugin *get_plugin_by_id(long id) @@ -261,33 +261,33 @@ return; } state.running = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); G_LOCK (running_plugins); for (list= running_plugins; list != NULL; list = g_slist_next(list)) { plugin_instance *instance = (plugin_instance *) list->data; gchar *section = g_strdup_printf("ladspa_plugin%d", plugins++); int port, ports= 0; - bmp_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID); - bmp_cfg_db_set_string(db, section, "file", instance->filename); - bmp_cfg_db_set_string(db, section, "label", (gchar *) + aud_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID); + aud_cfg_db_set_string(db, section, "file", instance->filename); + aud_cfg_db_set_string(db, section, "label", (gchar *) instance->descriptor->Label); ports = instance->descriptor->PortCount; if (ports > MAX_KNOBS) ports = MAX_KNOBS; for (port= 0; port < ports; ++port) { gchar *key = g_strdup_printf("port%d", port); - bmp_cfg_db_set_float(db, section, key, instance->knobs[port]); + aud_cfg_db_set_float(db, section, key, instance->knobs[port]); g_free(key); } - bmp_cfg_db_set_int(db, section, "ports", ports); + aud_cfg_db_set_int(db, section, "ports", ports); g_free(section); ladspa_shutdown (instance); } G_UNLOCK (running_plugins); - bmp_cfg_db_set_int(db, "ladspa", "plugins", plugins); - bmp_cfg_db_close(db); + aud_cfg_db_set_int(db, "ladspa", "plugins", plugins); + aud_cfg_db_close(db); } static void ladspa_shutdown (plugin_instance *instance) diff -r c162b6a0f11f -r 3aa95f65c24d src/lastfm/lastfm.c --- a/src/lastfm/lastfm.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/lastfm/lastfm.c Sat Oct 27 07:26:32 2007 -0500 @@ -112,11 +112,11 @@ gchar *buf=NULL, *username = NULL, *password = NULL; - if ((cfg = bmp_cfg_db_open()) != NULL) + if ((cfg = aud_cfg_db_open()) != NULL) { - bmp_cfg_db_get_string(cfg, "audioscrobbler","username", + aud_cfg_db_get_string(cfg, "audioscrobbler","username", &username); - bmp_cfg_db_get_string(cfg, "audioscrobbler","password", + aud_cfg_db_get_string(cfg, "audioscrobbler","password", &password); g_free(cfg); } diff -r c162b6a0f11f -r 3aa95f65c24d src/madplug/configure.c --- a/src/madplug/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/madplug/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -77,35 +77,35 @@ audmad_config_compute(&audmad_config); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "MAD", "http_buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "MAD", "http_buffer_size", audmad_config.http_buffer_size); - bmp_cfg_db_set_bool(db, "MAD", "fast_play_time_calc", + aud_cfg_db_set_bool(db, "MAD", "fast_play_time_calc", audmad_config.fast_play_time_calc); - bmp_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing); - bmp_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither); - bmp_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis); - bmp_cfg_db_set_bool(db, "MAD", "hard_limit", + aud_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing); + aud_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither); + aud_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis); + aud_cfg_db_set_bool(db, "MAD", "hard_limit", audmad_config.hard_limit); - bmp_cfg_db_set_string(db, "MAD", "pregain_db", + aud_cfg_db_set_string(db, "MAD", "pregain_db", audmad_config.pregain_db); - bmp_cfg_db_set_bool(db, "MAD", "RG.enable", + aud_cfg_db_set_bool(db, "MAD", "RG.enable", audmad_config.replaygain.enable); - bmp_cfg_db_set_bool(db, "MAD", "RG.track_mode", + aud_cfg_db_set_bool(db, "MAD", "RG.track_mode", audmad_config.replaygain.track_mode); - bmp_cfg_db_set_string(db, "MAD", "RG.default_db", + aud_cfg_db_set_string(db, "MAD", "RG.default_db", audmad_config.replaygain.default_db); - bmp_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override); - bmp_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format); + aud_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override); + aud_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format); - bmp_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate", + aud_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate", audmad_config.show_avg_vbr_bitrate); - bmp_cfg_db_set_bool(db, "MAD", "force_reopen_audio", + aud_cfg_db_set_bool(db, "MAD", "force_reopen_audio", audmad_config.force_reopen_audio); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); } diff -r c162b6a0f11f -r 3aa95f65c24d src/madplug/plugin.c --- a/src/madplug/plugin.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/madplug/plugin.c Sat Oct 27 07:26:32 2007 -0500 @@ -131,34 +131,34 @@ audmad_config.show_avg_vbr_bitrate = TRUE; audmad_config.force_reopen_audio = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if (db) { - bmp_cfg_db_get_bool(db, "MAD", "fast_play_time_calc", + aud_cfg_db_get_bool(db, "MAD", "fast_play_time_calc", &audmad_config.fast_play_time_calc); - bmp_cfg_db_get_bool(db, "MAD", "use_xing", + aud_cfg_db_get_bool(db, "MAD", "use_xing", &audmad_config.use_xing); - bmp_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither); - bmp_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis); - bmp_cfg_db_get_bool(db, "MAD", "hard_limit", + aud_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither); + aud_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis); + aud_cfg_db_get_bool(db, "MAD", "hard_limit", &audmad_config.hard_limit); - bmp_cfg_db_get_string(db, "MAD", "pregain_db", + aud_cfg_db_get_string(db, "MAD", "pregain_db", &audmad_config.pregain_db); - bmp_cfg_db_get_bool(db, "MAD", "RG.enable", + aud_cfg_db_get_bool(db, "MAD", "RG.enable", &audmad_config.replaygain.enable); - bmp_cfg_db_get_bool(db, "MAD", "RG.track_mode", + aud_cfg_db_get_bool(db, "MAD", "RG.track_mode", &audmad_config.replaygain.track_mode); - bmp_cfg_db_get_string(db, "MAD", "RG.default_db", + aud_cfg_db_get_string(db, "MAD", "RG.default_db", &audmad_config.replaygain.default_db); - bmp_cfg_db_get_bool(db, "MAD", "title_override", + aud_cfg_db_get_bool(db, "MAD", "title_override", &audmad_config.title_override); - bmp_cfg_db_get_string(db, "MAD", "id3_format", + aud_cfg_db_get_string(db, "MAD", "id3_format", &audmad_config.id3_format); - bmp_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate", + aud_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate", &audmad_config.show_avg_vbr_bitrate); - bmp_cfg_db_get_bool(db, "MAD", "force_reopen_audio", + aud_cfg_db_get_bool(db, "MAD", "force_reopen_audio", &audmad_config.force_reopen_audio); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } mad_mutex = g_mutex_new(); diff -r c162b6a0f11f -r 3aa95f65c24d src/modplug/gui/main.cxx --- a/src/modplug/gui/main.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/modplug/gui/main.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -41,12 +41,15 @@ { if(!AboutWin) { - gchar * about_text = g_strjoin( "" , _("Modplug Input Plugin for Audacious ver") , - VERSION , _("\nModplug sound engine written by Olivier Lapicque.\nXMMS interface for Modplug by Kenton Varda.\n(c)2000 Olivier Lapicque and Kenton Varda.\nUpdates and Maintainance by Konstanty Bialkowski.\nPorted to BMP by Theofilos Intzoglou.") , NULL ); - AboutWin = audacious_info_dialog( _("About Modplug") , about_text , _("Ok") , FALSE , NULL , NULL ); - gtk_signal_connect( GTK_OBJECT(AboutWin) , "destroy" , + gchar * about_text = g_strjoin("", + _("Modplug Input Plugin for Audacious ver"), VERSION, + _("\nModplug sound engine written by Olivier Lapicque.\nXMMS interface for Modplug by Kenton Varda.\n(c)2000 Olivier Lapicque and Kenton Varda.\nUpdates and Maintainance by Konstanty Bialkowski.\nPorted to BMP by Theofilos Intzoglou."), + NULL); + + AboutWin = audacious_info_dialog(_("About Modplug"), about_text, _("Ok"), FALSE, NULL, NULL); + gtk_signal_connect(GTK_OBJECT(AboutWin), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AboutWin); - g_free( about_text ); + g_free(about_text); } gtk_widget_show(AboutWin); } @@ -179,7 +182,7 @@ lInfo = lShortFN; lInfo += '\n'; - tmps = aud_str_to_utf8(lSoundFile->GetTitle()); + tmps = MODPLUG_CONVERT(lSoundFile->GetTitle()); lInfo += tmps; g_free(tmps); lInfo += '\n'; @@ -279,7 +282,7 @@ for(i = 0; i < lNumSamples; i++) { lSoundFile->GetSampleName(i, lBuffer); - tmps = aud_str_to_utf8(lBuffer); + tmps = MODPLUG_CONVERT(lBuffer); lInfo += tmps; g_free(tmps); lInfo += '\n'; @@ -290,7 +293,7 @@ for(i = 0; i < lNumInstruments; i++) { lSoundFile->GetInstrumentName(i, lBuffer); - tmps = aud_str_to_utf8(lBuffer); + tmps = MODPLUG_CONVERT(lBuffer); lInfo += tmps; g_free(tmps); lInfo += '\n'; @@ -304,7 +307,7 @@ //gtk_text_backward_delete(textbox, length); length = lSoundFile->GetSongComments(message, MAX_MESSAGE_LENGTH, 80); if (length != 0) { - tmps = aud_str_to_utf8(message); + tmps = MODPLUG_CONVERT(message); gtk_label_set_text((GtkLabel*)lookup_widget(InfoWin, "info_message"), tmps); g_free(tmps); } diff -r c162b6a0f11f -r 3aa95f65c24d src/modplug/modplugbmp.cxx --- a/src/modplug/modplugbmp.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/modplug/modplugbmp.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -76,32 +76,32 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_bool(db,"modplug","Surround", &mModProps.mSurround); - bmp_cfg_db_get_bool(db,"modplug","Oversampling", &mModProps.mOversamp); - bmp_cfg_db_get_bool(db,"modplug","Megabass", &mModProps.mMegabass); - bmp_cfg_db_get_bool(db,"modplug","NoiseReduction", &mModProps.mNoiseReduction); - bmp_cfg_db_get_bool(db,"modplug","VolumeRamp", &mModProps.mVolumeRamp); - bmp_cfg_db_get_bool(db,"modplug","Reverb", &mModProps.mReverb); - bmp_cfg_db_get_bool(db,"modplug","FastInfo", &mModProps.mFastinfo); - bmp_cfg_db_get_bool(db,"modplug","UseFileName", &mModProps.mUseFilename); - bmp_cfg_db_get_bool(db,"modplug","GrabAmigaMOD", &mModProps.mGrabAmigaMOD); - bmp_cfg_db_get_bool(db,"modplug","PreAmp", &mModProps.mPreamp); - bmp_cfg_db_get_float(db,"modplug","PreAmpLevel", &mModProps.mPreampLevel); - bmp_cfg_db_get_int(db,"modplug", "Channels", &mModProps.mChannels); - bmp_cfg_db_get_int(db,"modplug", "Bits", &mModProps.mBits); - bmp_cfg_db_get_int(db,"modplug", "Frequency", &mModProps.mFrequency); - bmp_cfg_db_get_int(db,"modplug", "ResamplineMode", &mModProps.mResamplingMode); - bmp_cfg_db_get_int(db,"modplug", "ReverbDepth", &mModProps.mReverbDepth); - bmp_cfg_db_get_int(db,"modplug", "ReverbDelay", &mModProps.mReverbDelay); - bmp_cfg_db_get_int(db,"modplug", "BassAmount", &mModProps.mBassAmount); - bmp_cfg_db_get_int(db,"modplug", "BassRange", &mModProps.mBassRange); - bmp_cfg_db_get_int(db,"modplug", "SurroundDepth", &mModProps.mSurroundDepth); - bmp_cfg_db_get_int(db,"modplug", "SurroundDelay", &mModProps.mSurroundDelay); - bmp_cfg_db_get_int(db,"modplug", "LoopCount", &mModProps.mLoopCount); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Surround", &mModProps.mSurround); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Oversampling", &mModProps.mOversamp); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Megabass", &mModProps.mMegabass); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"NoiseReduction", &mModProps.mNoiseReduction); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"VolumeRamp", &mModProps.mVolumeRamp); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Reverb", &mModProps.mReverb); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"FastInfo", &mModProps.mFastinfo); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"UseFileName", &mModProps.mUseFilename); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", &mModProps.mGrabAmigaMOD); + aud_cfg_db_get_bool(db, MODPLUG_CFGID,"PreAmp", &mModProps.mPreamp); + aud_cfg_db_get_float(db, MODPLUG_CFGID,"PreAmpLevel", &mModProps.mPreampLevel); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "Channels", &mModProps.mChannels); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "Bits", &mModProps.mBits); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "Frequency", &mModProps.mFrequency); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "ResamplineMode", &mModProps.mResamplingMode); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDepth", &mModProps.mReverbDepth); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDelay", &mModProps.mReverbDelay); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassAmount", &mModProps.mBassAmount); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassRange", &mModProps.mBassRange); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDepth", &mModProps.mSurroundDepth); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDelay", &mModProps.mSurroundDelay); + aud_cfg_db_get_int(db, MODPLUG_CFGID, "LoopCount", &mModProps.mLoopCount); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } bool ModplugXMMS::CanPlayFileFromVFS(const string& aFilename, VFSFile *file) @@ -504,7 +504,7 @@ { CSoundFile* lSoundFile; Archive* lArchive; - std::string tmps; + const gchar *tmps; //open and mmap the file lArchive = OpenArchive(aFilename); @@ -543,15 +543,11 @@ case MOD_TYPE_PSM: tmps = "Protracker Studio Module"; break; default: tmps = "ModPlug unknown"; break; } - aud_tuple_associate_string(ti, FIELD_CODEC, NULL, tmps.c_str()); + aud_tuple_associate_string(ti, FIELD_CODEC, NULL, tmps); aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced"); aud_tuple_associate_int(ti, FIELD_LENGTH, NULL, lSoundFile->GetSongTime() * 1000); - - /* NOTICE! FIXME? This is actually incorrect. We _cannot_ know what charset - * an arbitrary module file uses .. typically it is some DOS CP-variant, - * except for true Amiga modules. - */ - gchar *tmps2 = aud_str_to_utf8(lSoundFile->GetTitle()); + + gchar *tmps2 = MODPLUG_CONVERT(lSoundFile->GetTitle()); aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmps2); g_free(tmps2); @@ -637,32 +633,32 @@ CSoundFile::SetResamplingMode(mModProps.mResamplingMode); mPreampFactor = exp(mModProps.mPreampLevel); - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db,"modplug","Surround", mModProps.mSurround); - bmp_cfg_db_set_bool(db,"modplug","Oversampling", mModProps.mOversamp); - bmp_cfg_db_set_bool(db,"modplug","Megabass", mModProps.mMegabass); - bmp_cfg_db_set_bool(db,"modplug","NoiseReduction", mModProps.mNoiseReduction); - bmp_cfg_db_set_bool(db,"modplug","VolumeRamp", mModProps.mVolumeRamp); - bmp_cfg_db_set_bool(db,"modplug","Reverb", mModProps.mReverb); - bmp_cfg_db_set_bool(db,"modplug","FastInfo", mModProps.mFastinfo); - bmp_cfg_db_set_bool(db,"modplug","UseFileName", mModProps.mUseFilename); - bmp_cfg_db_set_bool(db,"modplug","GrabAmigaMOD", mModProps.mGrabAmigaMOD); - bmp_cfg_db_set_bool(db,"modplug","PreAmp", mModProps.mPreamp); - bmp_cfg_db_set_float(db,"modplug","PreAmpLevel", mModProps.mPreampLevel); - bmp_cfg_db_set_int(db,"modplug", "Channels", mModProps.mChannels); - bmp_cfg_db_set_int(db,"modplug", "Bits", mModProps.mBits); - bmp_cfg_db_set_int(db,"modplug", "Frequency", mModProps.mFrequency); - bmp_cfg_db_set_int(db,"modplug", "ResamplineMode", mModProps.mResamplingMode); - bmp_cfg_db_set_int(db,"modplug", "ReverbDepth", mModProps.mReverbDepth); - bmp_cfg_db_set_int(db,"modplug", "ReverbDelay", mModProps.mReverbDelay); - bmp_cfg_db_set_int(db,"modplug", "BassAmount", mModProps.mBassAmount); - bmp_cfg_db_set_int(db,"modplug", "BassRange", mModProps.mBassRange); - bmp_cfg_db_set_int(db,"modplug", "SurroundDepth", mModProps.mSurroundDepth); - bmp_cfg_db_set_int(db,"modplug", "SurroundDelay", mModProps.mSurroundDelay); - bmp_cfg_db_set_int(db,"modplug", "LoopCount", mModProps.mLoopCount); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Surround", mModProps.mSurround); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Oversampling", mModProps.mOversamp); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Megabass", mModProps.mMegabass); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"NoiseReduction", mModProps.mNoiseReduction); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"VolumeRamp", mModProps.mVolumeRamp); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Reverb", mModProps.mReverb); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"FastInfo", mModProps.mFastinfo); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"UseFileName", mModProps.mUseFilename); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", mModProps.mGrabAmigaMOD); + aud_cfg_db_set_bool(db, MODPLUG_CFGID,"PreAmp", mModProps.mPreamp); + aud_cfg_db_set_float(db, MODPLUG_CFGID,"PreAmpLevel", mModProps.mPreampLevel); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "Channels", mModProps.mChannels); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "Bits", mModProps.mBits); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "Frequency", mModProps.mFrequency); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "ResamplineMode", mModProps.mResamplingMode); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDepth", mModProps.mReverbDepth); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDelay", mModProps.mReverbDelay); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassAmount", mModProps.mBassAmount); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassRange", mModProps.mBassRange); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDepth", mModProps.mSurroundDepth); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDelay", mModProps.mSurroundDelay); + aud_cfg_db_set_int(db, MODPLUG_CFGID, "LoopCount", mModProps.mLoopCount); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } ModplugXMMS gModplugXMMS; diff -r c162b6a0f11f -r 3aa95f65c24d src/modplug/sndfile.cxx --- a/src/modplug/sndfile.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/modplug/sndfile.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -174,12 +174,7 @@ LPSTR p = m_szNames[i]; int j = 31; p[j] = 0; - while ((j>=0) && (p[j]<=' ')) p[j--] = 0; - while (j>=0) - { - if (((BYTE)p[j]) < ' ') p[j] = ' '; - j--; - } + while ((j >= 0) && (p[j] == ' ')) p[j--] = 0; } // Adjust channels for (i=0; i + +#define MODPLUG_CFGID "modplug" +#define MODPLUG_CONVERT(X) g_convert(X, -1, "UTF-8", "CP850", NULL, NULL, NULL) + //Invalid pointer #ifndef NULL #define NULL 0 @@ -21,17 +26,17 @@ // platforms. For example, long is 64-bit on some 64-bit systems. //u = unsigned //# = size in bits -typedef unsigned char uchar; +typedef guchar uchar; -typedef char int8; -typedef short int16; -typedef int int32; -typedef long long int64; +typedef gint8 int8; +typedef gint16 int16; +typedef gint32 int32; +typedef gint64 int64; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int uint32; -typedef unsigned long long uint64; +typedef guint8 uint8; +typedef guint16 uint16; +typedef guint32 uint32; +typedef guint64 uint64; typedef float float32; typedef double float64; diff -r c162b6a0f11f -r 3aa95f65c24d src/musepack/libmpc.cxx --- a/src/musepack/libmpc.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/musepack/libmpc.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -773,7 +773,7 @@ static void* decodeStream(InputPlayback *data) { lockAcquire(); - char* filename = data->filename; + gchar* filename = data->filename; VFSFile *input = aud_vfs_fopen(filename, "rb"); if (!input) { diff -r c162b6a0f11f -r 3aa95f65c24d src/neon/neon.c --- a/src/neon/neon.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/neon/neon.c Sat Oct 27 07:26:32 2007 -0500 @@ -555,17 +555,17 @@ _ENTER; - db = bmp_cfg_db_open(); - if (FALSE == bmp_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) { + db = aud_cfg_db_open(); + if (FALSE == aud_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) { use_proxy = FALSE; } if (use_proxy) { - if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) { + if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) { _ERROR("Could not read proxy host, disabling proxy use"); use_proxy = FALSE; } - if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) { + if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) { _ERROR("Could not read proxy port, disabling proxy use"); use_proxy = FALSE; } @@ -578,7 +578,7 @@ use_proxy = FALSE; } } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); handle->redircount = 0; diff -r c162b6a0f11f -r 3aa95f65c24d src/null/null.c --- a/src/null/null.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/null/null.c Sat Oct 27 07:26:32 2007 -0500 @@ -45,9 +45,9 @@ static void null_init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_bool(db, "null", "real_time", &real_time); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_get_bool(db, "null", "real_time", &real_time); + aud_cfg_db_close(db); } static void null_about(void) @@ -75,10 +75,10 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); real_time = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data)); - bmp_cfg_db_set_bool(db, "null", "real_time", real_time); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "null", "real_time", real_time); + aud_cfg_db_close(db); gtk_widget_destroy(configurewin); } diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal-ng/.depend diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal-ng/cfg.c --- a/src/paranormal-ng/cfg.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/paranormal-ng/cfg.c Sat Oct 27 07:26:32 2007 -0500 @@ -370,11 +370,11 @@ GtkCTreeNode *root; ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); fname = (char *) gtk_file_selection_get_filename (selector); a = load_preset (fname); - bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); - bmp_cfg_db_close(db); + aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); + aud_cfg_db_close(db); if (! a) pn_error ("Unable to load file: \"%s\"", fname); else @@ -395,12 +395,12 @@ ConfigDb *db; gchar *last_path; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); selector = gtk_file_selection_new ("Load Preset"); - if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { + if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path); } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector); diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal-ng/libcalc/.depend diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal-ng/presets/.depend diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal-ng/presets/.depend-done diff -r c162b6a0f11f -r 3aa95f65c24d src/paranormal/cfg.c --- a/src/paranormal/cfg.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/paranormal/cfg.c Sat Oct 27 07:26:32 2007 -0500 @@ -370,11 +370,11 @@ GtkCTreeNode *root; ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); fname = (char *) gtk_file_selection_get_filename (selector); a = load_preset (fname); - bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); - bmp_cfg_db_close(db); + aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); + aud_cfg_db_close(db); if (! a) pn_error ("Unable to load file: \"%s\"", fname); else @@ -395,12 +395,12 @@ ConfigDb *db; gchar *last_path; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); selector = gtk_file_selection_new ("Load Preset"); - if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { + if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path); } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector); diff -r c162b6a0f11f -r 3aa95f65c24d src/rootvis/config_backend.c --- a/src/rootvis/config_backend.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/rootvis/config_backend.c Sat Oct 27 07:26:32 2007 -0500 @@ -43,18 +43,18 @@ { case BOOLN: case INT: - bmp_cfg_db_set_int(fp, sect, val.name, *val.vali.var); + aud_cfg_db_set_int(fp, sect, val.name, *val.vali.var); break; case FLOAT: - bmp_cfg_db_set_float(fp, sect, val.name, *val.valf.var); + aud_cfg_db_set_float(fp, sect, val.name, *val.valf.var); break; case TEXT: - bmp_cfg_db_set_string(fp, sect, val.name, *val.valt.var); + aud_cfg_db_set_string(fp, sect, val.name, *val.valt.var); break; case COLOR: { char colortmp[10]; - bmp_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp)); + aud_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp)); } break; } @@ -66,21 +66,21 @@ { case BOOLN: case INT: - if (!(bmp_cfg_db_get_int(fp, sect, val.name, val.vali.var))) + if (!(aud_cfg_db_get_int(fp, sect, val.name, val.vali.var))) cval_writefile(val, fp, sect); break; case FLOAT: - if (!(bmp_cfg_db_get_float(fp, sect, val.name, val.valf.var))) + if (!(aud_cfg_db_get_float(fp, sect, val.name, val.valf.var))) cval_writefile(val, fp, sect); break; case TEXT: - if (!(bmp_cfg_db_get_string(fp, sect, val.name, val.valt.var))) + if (!(aud_cfg_db_get_string(fp, sect, val.name, val.valt.var))) cval_writefile(val, fp, sect); break; case COLOR: { char* colortmp = NULL; - if (!(bmp_cfg_db_get_string(fp, sect, val.name, &colortmp))) + if (!(aud_cfg_db_get_string(fp, sect, val.name, &colortmp))) cval_writefile(val, fp, sect); else color_quad2arr(val.valc.var, colortmp); } @@ -95,7 +95,7 @@ int i, j; ConfigDb *fp; - fp = bmp_cfg_db_open(); + fp = aud_cfg_db_open(); print_status("Reading configuration"); @@ -114,7 +114,7 @@ cval_readfile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2")); } - bmp_cfg_db_close(fp); + aud_cfg_db_close(fp); print_status("Configuration finished"); } @@ -123,7 +123,7 @@ ConfigDb *fp; print_status("Writing configuration"); - fp = bmp_cfg_db_open(); + fp = aud_cfg_db_open(); if (number == 2) for (i = 0; i < Cmain.count; ++i) @@ -134,7 +134,7 @@ for (i = 0; i < Cchannel[j].count; ++i) cval_writefile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2")); - bmp_cfg_db_close(fp); + aud_cfg_db_close(fp); } void config_revert(int number) { diff -r c162b6a0f11f -r 3aa95f65c24d src/scrobbler/configure.c --- a/src/scrobbler/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/scrobbler/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -50,20 +50,20 @@ const char *ge_uid = gtk_entry_get_text(GTK_ENTRY(ge_entry1)); const char *ge_pwd = gtk_entry_get_text(GTK_ENTRY(ge_entry2)); - if ((cfgfile = bmp_cfg_db_open())) + if ((cfgfile = aud_cfg_db_open())) { md5_state_t md5state; unsigned char md5pword[16], ge_md5pword[16]; - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid); + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid); + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid); if (pwd != NULL && pwd[0] != '\0' && strlen(pwd)) { md5_init(&md5state); md5_append(&md5state, (unsigned const char *)pwd, strlen(pwd)); md5_finish(&md5state, md5pword); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "password", + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "password", hexify((char*)md5pword, sizeof(md5pword))); } @@ -72,11 +72,11 @@ md5_init(&md5state); md5_append(&md5state, (unsigned const char *)ge_pwd, strlen(ge_pwd)); md5_finish(&md5state, ge_md5pword); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password", + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password", hexify((char*)ge_md5pword, sizeof(ge_md5pword))); } - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); } } @@ -197,10 +197,10 @@ gtk_entry_set_text(GTK_ENTRY(entry1), ""); gtk_entry_set_text(GTK_ENTRY(entry2), ""); - if ((db = bmp_cfg_db_open())) { + if ((db = aud_cfg_db_open())) { gchar *username = NULL; // last fm - bmp_cfg_db_get_string(db, "audioscrobbler", "username", + aud_cfg_db_get_string(db, "audioscrobbler", "username", &username); if (username) { gtk_entry_set_text(GTK_ENTRY(entry1), username); @@ -208,7 +208,7 @@ username = NULL; } // gerpok - bmp_cfg_db_get_string(db, "audioscrobbler", "ge_username", + aud_cfg_db_get_string(db, "audioscrobbler", "ge_username", &username); if (username) { gtk_entry_set_text(GTK_ENTRY(ge_entry1), username); @@ -216,7 +216,7 @@ username = NULL; } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } return vbox2; diff -r c162b6a0f11f -r 3aa95f65c24d src/scrobbler/plugin.c --- a/src/scrobbler/plugin.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/scrobbler/plugin.c Sat Oct 27 07:26:32 2007 -0500 @@ -103,16 +103,16 @@ aud_prefswin_page_new(cfgdlg, "Scrobbler", DATA_DIR "/images/audioscrobbler.png"); - if ((cfgfile = bmp_cfg_db_open()) != NULL) { - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "username", + if ((cfgfile = aud_cfg_db_open()) != NULL) { + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "username", &username); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "password", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "password", &password); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username", &ge_username); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password", &ge_password); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); } if ((!username || !password) || (!*username || !*password)) diff -r c162b6a0f11f -r 3aa95f65c24d src/sexypsf/plugin.c --- a/src/sexypsf/plugin.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/sexypsf/plugin.c Sat Oct 27 07:26:32 2007 -0500 @@ -113,7 +113,9 @@ } // timeout at the end of a file - sleep(4); + while (playback->output->buffer_playing()) + g_usleep(10000); + break; } @@ -222,10 +224,10 @@ if (tmp->length) { tuple = aud_tuple_new_from_filename(fn); - aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, tmp->length); - aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, tmp->artist); - aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, tmp->game); - aud_tuple_associate_string(tuple, -1, "game", tmp->game); + aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, tmp->length); + aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, tmp->artist); + aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, tmp->game); + aud_tuple_associate_string(tuple, -1, "game", tmp->game); aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, tmp->title); aud_tuple_associate_string(tuple, FIELD_GENRE, NULL, tmp->genre); aud_tuple_associate_string(tuple, FIELD_COPYRIGHT, NULL, tmp->copyright); diff -r c162b6a0f11f -r 3aa95f65c24d src/shnplug/gtk.c --- a/src/shnplug/gtk.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/shnplug/gtk.c Sat Oct 27 07:26:32 2007 -0500 @@ -125,16 +125,16 @@ shn_cfg.textfile_extensions = g_strdup(gtk_entry_get_text(GTK_ENTRY(textfile_extensions_entry))); filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions); + cfg = aud_cfg_db_open(); + aud_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions); - bmp_cfg_db_close(cfg); + aud_cfg_db_close(cfg); g_free(filename); } diff -r c162b6a0f11f -r 3aa95f65c24d src/shnplug/shn.c --- a/src/shnplug/shn.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/shnplug/shn.c Sat Oct 27 07:26:32 2007 -0500 @@ -107,19 +107,19 @@ shn_cfg.textfile_extensions = NULL; shn_cfg.textfile_extensions_config_name = "textfile_extensions"; - if ((cfg = bmp_cfg_db_open()) != 0) + if ((cfg = aud_cfg_db_open()) != 0) { - bmp_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path)) + aud_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method); + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose); + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path)) shn_cfg.seek_tables_path = g_strdup(g_get_home_dir()); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path)) + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path)) shn_cfg.relative_seek_tables_path = g_strdup(""); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions)) + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes); + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles); + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions)) shn_cfg.textfile_extensions = g_strdup("txt,nfo"); - bmp_cfg_db_close(cfg); + aud_cfg_db_close(cfg); } } diff -r c162b6a0f11f -r 3aa95f65c24d src/sndstretch/sndstretch_xmms.c --- a/src/sndstretch/sndstretch_xmms.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/sndstretch/sndstretch_xmms.c Sat Oct 27 07:26:32 2007 -0500 @@ -257,15 +257,15 @@ static gint sndstretch_config_destroy_cb(GtkWidget * w, GdkEventAny * e, gpointer data) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch); - bmp_cfg_db_set_double(db, "sndstretch", "speed", SS.speed); + aud_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch); + aud_cfg_db_set_double(db, "sndstretch", "speed", SS.speed); - bmp_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap); - bmp_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr); + aud_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap); + aud_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(sndstretch_config_dialog); sndstretch_config_dialog = NULL; @@ -405,7 +405,7 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); SS.fragsize=0; SS.chnr=2; @@ -423,13 +423,13 @@ SS.scale=1.0; gboolean b; - bmp_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch); - bmp_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed); - if (bmp_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b)) + aud_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch); + aud_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed); + if (aud_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b)) SS.short_overlap = b; - if (bmp_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b)) + if (aud_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b)) SS.volume_corr = b; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } int sndstretch_mod_samples (gpointer *ptr, gint length, AFormat fmt, gint srate, gint nch) diff -r c162b6a0f11f -r 3aa95f65c24d src/song_change/song_change.c --- a/src/song_change/song_change.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/song_change/song_change.c Sat Oct 27 07:26:32 2007 -0500 @@ -169,16 +169,16 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) ) + db = aud_cfg_db_open(); + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) ) cmd_line = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) ) cmd_line_after = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) ) cmd_line_end = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) ) cmd_line_ttc = g_strdup(""); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void cleanup(void) @@ -219,12 +219,12 @@ cmd_end = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_end_entry))); cmd_ttc = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_ttc_entry))); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_string(db, "song_change", "cmd_line", cmd); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_string(db, "song_change", "cmd_line", cmd); + aud_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after); + aud_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end); + aud_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc); + aud_cfg_db_close(db); if (cmd_line != NULL) g_free(cmd_line); diff -r c162b6a0f11f -r 3aa95f65c24d src/statusicon/si_cfg.c --- a/src/statusicon/si_cfg.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/statusicon/si_cfg.c Sat Oct 27 07:26:32 2007 -0500 @@ -29,27 +29,27 @@ void si_cfg_load ( void ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_int( cfgfile , "statusicon" , "rclick_menu" , &(si_cfg.rclick_menu) ) ) si_cfg.rclick_menu = SI_CFG_RCLICK_MENU_AUD; - if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_int( cfgfile , "statusicon" , "scroll_action" , &(si_cfg.scroll_action) ) ) si_cfg.scroll_action = SI_CFG_SCROLL_ACTION_VOLUME; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "mw_visib_prevstatus" , &(si_cfg.mw_visib_prevstatus) ) ) si_cfg.mw_visib_prevstatus = FALSE; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "pw_visib_prevstatus" , &(si_cfg.pw_visib_prevstatus) ) ) si_cfg.pw_visib_prevstatus = FALSE; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "ew_visib_prevstatus" , &(si_cfg.ew_visib_prevstatus) ) ) si_cfg.ew_visib_prevstatus = FALSE; - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return; } @@ -57,21 +57,21 @@ void si_cfg_save ( void ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int( cfgfile , "statusicon" , + aud_cfg_db_set_int( cfgfile , "statusicon" , "rclick_menu" , si_cfg.rclick_menu ); - bmp_cfg_db_set_int( cfgfile , "statusicon" , + aud_cfg_db_set_int( cfgfile , "statusicon" , "scroll_action" , si_cfg.scroll_action ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "mw_visib_prevstatus" , si_cfg.mw_visib_prevstatus ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "pw_visib_prevstatus" , si_cfg.pw_visib_prevstatus ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "ew_visib_prevstatus" , si_cfg.ew_visib_prevstatus ); - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return; } diff -r c162b6a0f11f -r 3aa95f65c24d src/stereo_plugin/stereo.c --- a/src/stereo_plugin/stereo.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/stereo_plugin/stereo.c Sat Oct 27 07:26:32 2007 -0500 @@ -36,10 +36,10 @@ static void init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - if (!bmp_cfg_db_get_double(db, "extra_stereo", "intensity", &value)) + db = aud_cfg_db_open(); + if (!aud_cfg_db_get_double(db, "extra_stereo", "intensity", &value)) value = 2.5; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void about(void) @@ -63,9 +63,9 @@ value = *(gdouble *) data; - db = bmp_cfg_db_open(); - bmp_cfg_db_set_double(db, "extra_stereo", "intensity", value); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_double(db, "extra_stereo", "intensity", value); + aud_cfg_db_close(db); gtk_widget_destroy(conf_dialog); } diff -r c162b6a0f11f -r 3aa95f65c24d src/sun/configure.c --- a/src/sun/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/sun/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -57,26 +57,26 @@ sun_mixer_close(); } - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devaudio", audio.devaudio); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devaudioctl", audio.devaudioctl); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devmixer", audio.devmixer); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "mixer_voldev", audio.mixer_voldev); - bmp_cfg_db_set_bool(cfgfile, "sun", + aud_cfg_db_set_bool(cfgfile, "sun", "mixer_keepopen", audio.mixer_keepopen); - bmp_cfg_db_set_int(cfgfile, "sun", + aud_cfg_db_set_int(cfgfile, "sun", "buffer_size", audio.req_buffer_size); - bmp_cfg_db_set_int(cfgfile, "sun", + aud_cfg_db_set_int(cfgfile, "sun", "prebuffer_size", audio.req_prebuffer_size); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); configure_win_destroy(); } diff -r c162b6a0f11f -r 3aa95f65c24d src/sun/sun.c --- a/src/sun/sun.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/sun/sun.c Sat Oct 27 07:26:32 2007 -0500 @@ -58,25 +58,25 @@ memset(&audio, 0, sizeof(struct sun_audio)); - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); /* Devices */ - bmp_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio); - bmp_cfg_db_get_string(cfgfile, "sun", + aud_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio); + aud_cfg_db_get_string(cfgfile, "sun", "audio_devaudioctl", &audio.devaudioctl); - bmp_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer); + aud_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer); /* Buffering */ - bmp_cfg_db_get_int(cfgfile, "sun", + aud_cfg_db_get_int(cfgfile, "sun", "buffer_size", &audio.req_buffer_size); - bmp_cfg_db_get_int(cfgfile, "sun", + aud_cfg_db_get_int(cfgfile, "sun", "prebuffer_size", &audio.req_prebuffer_size); /* Mixer */ - bmp_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev); - bmp_cfg_db_get_bool(cfgfile, "sun", + aud_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev); + aud_cfg_db_get_bool(cfgfile, "sun", "mixer_keepopen", &audio.mixer_keepopen); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); /* Audio device path */ if ((s = getenv("AUDIODEVICE"))) diff -r c162b6a0f11f -r 3aa95f65c24d src/timidity/xmms-timidity.c --- a/src/timidity/xmms-timidity.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/timidity/xmms-timidity.c Sat Oct 27 07:26:32 2007 -0500 @@ -90,16 +90,16 @@ xmmstimid_cfg.channels = 2; xmmstimid_cfg.buffer_size = 512; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - if (! bmp_cfg_db_get_string(db, "timidity", "config_file", + if (! aud_cfg_db_get_string(db, "timidity", "config_file", &xmmstimid_cfg.config_file)) xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg"); - bmp_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); - bmp_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); - bmp_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels); - bmp_cfg_db_close(db); + aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); + aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); + aud_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels); + aud_cfg_db_close(db); if (mid_init(xmmstimid_cfg.config_file) != 0) { xmmstimid_initialized = FALSE; @@ -203,18 +203,18 @@ else if (gtk_toggle_button_get_active(xmmstimid_conf_channels_2)) xmmstimid_cfg.channels = 2; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); g_free(xmmstimid_cfg.config_file); xmmstimid_cfg.config_file = g_strdup( gtk_entry_get_text(xmmstimid_conf_config_file)); - bmp_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file); + aud_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file); - bmp_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate); - bmp_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits); - bmp_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels); - bmp_cfg_db_close(db); + aud_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate); + aud_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits); + aud_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels); + aud_cfg_db_close(db); gtk_widget_hide(xmmstimid_conf_wnd); } diff -r c162b6a0f11f -r 3aa95f65c24d src/vorbis/configure.c --- a/src/vorbis/configure.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/vorbis/configure.c Sat Oct 27 07:26:32 2007 -0500 @@ -49,19 +49,19 @@ else vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_ALBUM; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "vorbis", "tag_override", + aud_cfg_db_set_bool(db, "vorbis", "tag_override", vorbis_cfg.tag_override); - bmp_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format); - bmp_cfg_db_set_bool(db, "vorbis", "use_anticlip", + aud_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format); + aud_cfg_db_set_bool(db, "vorbis", "use_anticlip", vorbis_cfg.use_anticlip); - bmp_cfg_db_set_bool(db, "vorbis", "use_replaygain", + aud_cfg_db_set_bool(db, "vorbis", "use_replaygain", vorbis_cfg.use_replaygain); - bmp_cfg_db_set_int(db, "vorbis", "replaygain_mode", + aud_cfg_db_set_int(db, "vorbis", "replaygain_mode", vorbis_cfg.replaygain_mode); - bmp_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster); + aud_cfg_db_close(db); gtk_widget_destroy(vorbis_configurewin); } diff -r c162b6a0f11f -r 3aa95f65c24d src/vorbis/vorbis.c --- a/src/vorbis/vorbis.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/vorbis/vorbis.c Sat Oct 27 07:26:32 2007 -0500 @@ -799,42 +799,42 @@ vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_TRACK; vorbis_cfg.use_booster = FALSE; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "vorbis", "http_buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "vorbis", "http_buffer_size", &vorbis_cfg.http_buffer_size); - bmp_cfg_db_get_int(db, "vorbis", "http_prebuffer", + aud_cfg_db_get_int(db, "vorbis", "http_prebuffer", &vorbis_cfg.http_prebuffer); - bmp_cfg_db_get_bool(db, "vorbis", "save_http_stream", + aud_cfg_db_get_bool(db, "vorbis", "save_http_stream", &vorbis_cfg.save_http_stream); - if (!bmp_cfg_db_get_string(db, "vorbis", "save_http_path", + if (!aud_cfg_db_get_string(db, "vorbis", "save_http_path", &vorbis_cfg.save_http_path)) vorbis_cfg.save_http_path = g_strdup(g_get_home_dir()); - bmp_cfg_db_get_bool(db, "vorbis", "tag_override", + aud_cfg_db_get_bool(db, "vorbis", "tag_override", &vorbis_cfg.tag_override); - if (!bmp_cfg_db_get_string(db, "vorbis", "tag_format", + if (!aud_cfg_db_get_string(db, "vorbis", "tag_format", &vorbis_cfg.tag_format)) vorbis_cfg.tag_format = g_strdup("%p - %t"); - bmp_cfg_db_get_bool(db, "vorbis", "use_anticlip", + aud_cfg_db_get_bool(db, "vorbis", "use_anticlip", &vorbis_cfg.use_anticlip); - bmp_cfg_db_get_bool(db, "vorbis", "use_replaygain", + aud_cfg_db_get_bool(db, "vorbis", "use_replaygain", &vorbis_cfg.use_replaygain); - bmp_cfg_db_get_int(db, "vorbis", "replaygain_mode", + aud_cfg_db_get_int(db, "vorbis", "replaygain_mode", &vorbis_cfg.replaygain_mode); - bmp_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster); + aud_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster); - bmp_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy); - bmp_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host); - bmp_cfg_db_get_string(db, NULL, "proxy_port", &tmp); + aud_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy); + aud_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host); + aud_cfg_db_get_string(db, NULL, "proxy_port", &tmp); if (tmp != NULL) vorbis_cfg.proxy_port = atoi(tmp); - bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth); - bmp_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user); - bmp_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass); + aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth); + aud_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user); + aud_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); vf_mutex = g_mutex_new(); diff -r c162b6a0f11f -r 3aa95f65c24d src/vtx/vtx.c --- a/src/vtx/vtx.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/vtx/vtx.c Sat Oct 27 07:26:32 2007 -0500 @@ -61,13 +61,13 @@ vtx_init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_int(db, NULL, "src_rate", &freq); + aud_cfg_db_get_int(db, NULL, "src_rate", &freq); if (freq < 4000 || freq > 192000) freq = 44100; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } int diff -r c162b6a0f11f -r 3aa95f65c24d src/wavpack/libwavpack.cxx --- a/src/wavpack/libwavpack.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/wavpack/libwavpack.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -532,15 +532,15 @@ { ConfigDb *cfg; - cfg = bmp_cfg_db_open(); + cfg = aud_cfg_db_open(); - bmp_cfg_db_get_bool(cfg, "wavpack", "clip_prevention", + aud_cfg_db_get_bool(cfg, "wavpack", "clip_prevention", &clipPreventionEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "album_replaygain", + aud_cfg_db_get_bool(cfg, "wavpack", "album_replaygain", &albumReplaygainEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled); - bmp_cfg_db_close(cfg); + aud_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled); + aud_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled); + aud_cfg_db_close(cfg); openedAudio = false; } diff -r c162b6a0f11f -r 3aa95f65c24d src/wavpack/ui.cxx --- a/src/wavpack/ui.cxx Sat Oct 27 07:25:40 2007 -0500 +++ b/src/wavpack/ui.cxx Sat Oct 27 07:26:32 2007 -0500 @@ -428,15 +428,15 @@ tb = GTK_TOGGLE_BUTTON(rg_track_gain); albumReplaygainEnabled = !gtk_toggle_button_get_active(tb); - cfg = bmp_cfg_db_open(); + cfg = aud_cfg_db_open(); - bmp_cfg_db_set_bool(cfg, "wavpack", "clip_prevention", + aud_cfg_db_set_bool(cfg, "wavpack", "clip_prevention", clipPreventionEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "album_replaygain", + aud_cfg_db_set_bool(cfg, "wavpack", "album_replaygain", albumReplaygainEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled); - bmp_cfg_db_close(cfg); + aud_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled); + aud_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled); + aud_cfg_db_close(cfg); gtk_widget_destroy(wv_configurewin); } diff -r c162b6a0f11f -r 3aa95f65c24d src/xspf/xspf.c --- a/src/xspf/xspf.c Sat Oct 27 07:25:40 2007 -0500 +++ b/src/xspf/xspf.c Sat Oct 27 07:26:32 2007 -0500 @@ -145,13 +145,6 @@ location = g_strdup_printf("%s%s", base ? base : "", str); xmlFree(str); - str = g_filename_from_uri(location, NULL, NULL); - if (str) { - g_free(location); - location = g_strdup_printf("file://%s", str); - } - - g_free(str); } else { /* Rest of the nodes are handled here */ gint i;