Mercurial > audlegacy-plugins
changeset 1697:f35f9d6fcb6d
Automated merge with file:/home/ccr/audacious/plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 09 Sep 2007 23:23:00 +0300 |
| parents | 1ac047826c64 (current diff) 923615bf2f2f (diff) |
| children | 314cb383b807 |
| files | src/aac/src/libmp4.c src/adplug/adplug-xmms.cc src/alac/plugin.c src/console/Audacious_Driver.cxx src/filewriter/filewriter.c src/madplug/plugin.c src/mtp_up/mtp.c src/sid/xmms-sid.c src/statusicon/si_ui.c src/timidity/src/xmms-timidity.c src/tta/libtta.c src/vorbis/vorbis.c src/wav/wav-sndfile.c src/wav/wav.c src/wma/wma.c src/xspf/xspf.c |
| diffstat | 57 files changed, 165 insertions(+), 138 deletions(-) [+] |
line wrap: on
line diff
--- a/po/de.po Sun Sep 09 23:22:52 2007 +0300 +++ b/po/de.po Sun Sep 09 23:23:00 2007 +0300 @@ -3,7 +3,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n" "POT-Creation-Date: 2007-09-05 00:28+0200\n" -"PO-Revision-Date: 2007-09-08 00:43+0100\n" +"PO-Revision-Date: 2007-09-09 21:45+0100\n" "Last-Translator: Michael Färber <0102@gmx.at>\n" "Language-Team: german <0102@gmx.at>\n" "MIME-Version: 1.0\n" @@ -790,6 +790,8 @@ "<span size=\"smaller\">ALSA\n" "backend</span>" msgstr "" +"<span size=\"smaller\">ALSA-\n" +"Backend</span>" #: src/amidi-plug/i_configure-ap.c:56 msgid "AMIDI-Plug - backend information" @@ -821,15 +823,15 @@ #: src/amidi-plug/i_configure-ap.c:291 msgid "pre-calculate length of MIDI files in playlist" -msgstr "" +msgstr "Länge von MIDI-Dateien in der Wiedergabeliste ausrechnen" #: src/amidi-plug/i_configure-ap.c:296 msgid "extract comments from MIDI file (if available)" -msgstr "" +msgstr "Kommentare aus MIDI-Datei extrahieren (falls verfügbar)" #: src/amidi-plug/i_configure-ap.c:301 msgid "extract lyrics from MIDI file (if available)" -msgstr "" +msgstr "Liedtexte aus MIDI-Dateien extrahieren (falls verfügbar)" #: src/amidi-plug/i_configure-ap.c:320 msgid "" @@ -875,10 +877,12 @@ "<span size=\"smaller\">AMIDI\n" "Plug</span>" msgstr "" +"<span size=\"smaller\">AMIDI-\n" +"Plug</span>" #: src/amidi-plug/i_configure.c:75 msgid "AMIDI-Plug - select file" -msgstr "" +msgstr "AMIDI-Plug - Datei auswählen" #: src/amidi-plug/i_configure.c:122 msgid "AMIDI-Plug - configuration" @@ -886,7 +890,7 @@ #: src/amidi-plug/i_configure.c:241 msgid "AMIDI-Plug message" -msgstr "" +msgstr "AMIDI-Plug-Meldung" #: src/amidi-plug/i_configure.c:242 msgid "Please stop the player before changing AMIDI-Plug settings." @@ -906,15 +910,15 @@ #: src/amidi-plug/i_configure-dummy.c:185 msgid "Log MIDI events to standard output" -msgstr "" +msgstr "MIDI-Ereignisse an stdout loggen" #: src/amidi-plug/i_configure-dummy.c:189 msgid "Log MIDI events to standard error" -msgstr "" +msgstr "MIDI-Ereignisse an stderr loggen" #: src/amidi-plug/i_configure-dummy.c:193 msgid "Log MIDI events to file" -msgstr "" +msgstr "MIDI-Ereignisse in Datei loggen" #: src/amidi-plug/i_configure-dummy.c:202 msgid "Logfile settings" @@ -959,13 +963,15 @@ #: src/amidi-plug/i_configure-dummy.c:329 msgid "Dummy Backend not loaded or not available" -msgstr "" +msgstr "Dummy-Backend nicht geladen oder nicht verfügbar" #: src/amidi-plug/i_configure-dummy.c:348 msgid "" "<span size=\"smaller\">Dummy\n" "backend</span>" msgstr "" +"<span size=\"smaller\">Dummy-\n" +"Backend</span>" #: src/amidi-plug/i_configure-fluidsynth.c:83 msgid "AMIDI-Plug - select SoundFont file" @@ -973,7 +979,7 @@ #: src/amidi-plug/i_configure-fluidsynth.c:362 msgid "FLUIDSYNTH BACKEND CONFIGURATION" -msgstr "" +msgstr "Fluidsynth-Backend-Konfiguration" #: src/amidi-plug/i_configure-fluidsynth.c:416 msgid "SoundFont settings" @@ -1013,7 +1019,7 @@ #: src/amidi-plug/i_configure-fluidsynth.c:557 msgid "poliphony" -msgstr "" +msgstr "Polyphonie" #: src/amidi-plug/i_configure-fluidsynth.c:585 msgid "reverb" @@ -1035,7 +1041,7 @@ #: src/amidi-plug/i_configure-fluidsynth.c:647 msgid "sample rate" -msgstr "" +msgstr "Abtastfrequenz" #: src/amidi-plug/i_configure-fluidsynth.c:653 msgid "22050 Hz " @@ -1086,6 +1092,8 @@ "* Select SoundFont files *\n" "In order to play MIDI with FluidSynth, you need to specify at least one valid SoundFont file here (use absolute paths). The loading order is from the top (first) to the bottom (last)." msgstr "" +"* SoundFont-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)." #: src/amidi-plug/i_configure-fluidsynth.c:812 msgid "" @@ -2583,11 +2591,11 @@ #: src/lirc/about.c:65 msgid "About LIRC Audacious Plugin" -msgstr "" +msgstr "Über das LIRC-Audacious-Plugin" #: src/lirc/about.c:92 msgid "LIRC Plugin " -msgstr "" +msgstr "LIRC-Plugin " #: src/lirc/about.c:94 msgid "" @@ -2602,11 +2610,21 @@ "You can get LIRC information at:\n" "http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html" msgstr "" +"\n" +"Ein einfaches Plugin, das Audacious mithilfe des\n" +"LIRC-Daemons kontrollieren lässt\n" +"\n" +"Für Audacious angepasst von Tony Vroon <chainsaw@gentoo.org>\n" +"vom XMMS-LIRC-Plugin von:\n" +"Carl van Schaik <carl@leg.uct.ac.za>\n" +"Christoph Bartelmus <xmms@bartelmus.de>\n" +"Informationen zu LIRC sind verfügbar bei:\n" +"http://fsinfo.cs.uni-sb.de/~columbus/lirc/index.html" #: src/lirc/lirc.c:80 #, c-format msgid "%s: could not init LIRC support\n" -msgstr "" +msgstr "%s: Konnte LIRC-Unterstützung nicht initialisieren\n" #: src/lirc/lirc.c:88 #, c-format @@ -2877,6 +2895,11 @@ "e.g. tact://77 to play 77 beats per minute\n" "or tact://60*3/4 to play 60 bpm in 3/4 tacts" msgstr "" +"Ein Takt-Generator von Martin Strauss <mys@faveve.uni-stuttgart.de>\n" +"\n" +"Zur Verwendung eine URL hinzufügen: tact://Schläge*Zähler/Nenner\n" +"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:199 #: src/metronom/metronom.c:263 @@ -3108,7 +3131,7 @@ #: src/musepack/libmpc.cxx:147 msgid "Nevermind" -msgstr "" +msgstr "Vergiss es" #: src/musepack/libmpc.cxx:165 msgid "Musepack Decoder Configuration" @@ -3442,20 +3465,20 @@ #: src/sid/xmms-sid.c:209 msgid "Error initializing STIL database!\n" -msgstr "" +msgstr "Fehler beim Initialisieren der STIL-Datenbank!\n" #: src/sid/xmms-sid.c:414 msgid "Couldn't allocate memory for audio data buffer!\n" -msgstr "" +msgstr "Konnte keinen Speicher für den Audio-Daten-Buffer allozieren!\n" #: src/sid/xmms-sid.c:421 msgid "Couldn't allocate memory for audio oversampling buffer!\n" -msgstr "" +msgstr "Konnte keinen Speicher für den Audio-Oversampling-Buffer allozieren!\n" #: src/sid/xmms-sid.c:436 #, c-format msgid "Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n" -msgstr "" +msgstr "Konnte SID-Tune '%s' (Unter-Tune #%i) nicht initialisieren!\n" #: src/sid/xmms-sid.c:446 #, c-format @@ -3501,32 +3524,32 @@ #: src/sid/xmms-sid.glade:384 #: src/sid/xs_interface.c:345 msgid "Samplerate:" -msgstr "" +msgstr "Abtastfrequenz:" #: src/sid/xmms-sid.glade:430 #: src/sid/xs_interface.c:362 msgid "Use oversampling" -msgstr "" +msgstr "Oversampling benützen" #: src/sid/xmms-sid.glade:456 #: src/sid/xs_interface.c:373 msgid "Factor:" -msgstr "" +msgstr "Faktor:" #: src/sid/xmms-sid.glade:500 #: src/sid/xs_interface.c:385 msgid "Large factors require more CPU-power" -msgstr "" +msgstr "Große Faktoren benötigen mehr Rechenleistung" #: src/sid/xmms-sid.glade:534 #: src/sid/xs_interface.c:391 msgid "Oversampling:" -msgstr "" +msgstr "Oversampling:" #: src/sid/xmms-sid.glade:570 #: src/sid/xs_interface.c:396 msgid "Audio" -msgstr "" +msgstr "Audio" #: src/sid/xmms-sid.glade:620 #: src/sid/xs_interface.c:428 @@ -3611,7 +3634,7 @@ #: src/sid/xmms-sid.glade:865 #: src/sid/xs_interface.c:509 msgid "SIDPlay 2 (cycle-based)" -msgstr "" +msgstr "SIDPlay 2 (zyklus-basiert)" #: src/sid/xmms-sid.glade:887 #: src/sid/xs_interface.c:517 @@ -3701,17 +3724,17 @@ #: src/sid/xmms-sid.glade:1223 #: src/sid/xs_interface.c:637 msgid "Linear interpolation" -msgstr "" +msgstr "Lineare Interpolation" #: src/sid/xmms-sid.glade:1263 #: src/sid/xs_interface.c:652 msgid "Resampling (FIR)" -msgstr "" +msgstr "Resampling (FIR)" #: src/sid/xmms-sid.glade:1284 #: src/sid/xs_interface.c:659 msgid "reSID sampling options:" -msgstr "" +msgstr "reSID-Sampling-Optionen:" #: src/sid/xmms-sid.glade:1320 #: src/sid/xs_interface.c:664 @@ -3726,7 +3749,7 @@ #: src/sid/xmms-sid.glade:1352 #: src/sid/xs_interface.c:676 msgid "Emulate filters" -msgstr "" +msgstr "Filter emulieren" #: src/sid/xmms-sid.glade:1409 #: src/sid/xs_interface.c:705 @@ -3746,12 +3769,12 @@ #: src/sid/xmms-sid.glade:1549 #: src/sid/xs_interface.c:750 msgid "Reset values" -msgstr "" +msgstr "Werte zurücksetzen" #: src/sid/xmms-sid.glade:1578 #: src/sid/xs_interface.c:755 msgid "SIDPlay1" -msgstr "" +msgstr "SIDPlay1" #: src/sid/xmms-sid.glade:1690 #: src/sid/xs_interface.c:796 @@ -3791,12 +3814,12 @@ #: src/sid/xmms-sid.glade:1935 #: src/sid/xs_interface.c:880 msgid "If enabled, the tune is played at least for the specified time, adding silence to the end if necessary." -msgstr "" +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:876 msgid "Play at least for specified time" -msgstr "" +msgstr "Mindestens für die angegebene Zeit spielen" #: src/sid/xmms-sid.glade:1962 #: src/sid/xmms-sid.glade:2133 @@ -3906,32 +3929,32 @@ #: src/sid/xmms-sid.glade:2669 #: src/sid/xs_interface.c:1115 msgid "Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory." -msgstr "" +msgstr "Pfad und Dateiname der STIL-Datenbank-Datei (STIL.txt), üblicherweise im HVSC-DOCUMENTS-Unterverzeichnis." #: src/sid/xmms-sid.glade:2704 #: src/sid/xs_interface.c:1128 msgid "Browse for STIL-database file" -msgstr "" +msgstr "Nach STIL-Datenbank-Datei suchen" #: src/sid/xmms-sid.glade:2738 #: src/sid/xs_interface.c:1135 msgid "HVSC path:" -msgstr "" +msgstr "HVSC-Pfad:" #: src/sid/xmms-sid.glade:2775 #: src/sid/xs_interface.c:1151 msgid "Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/" -msgstr "" +msgstr "Pfad zum Basis-Verzeichnis der High Voltage SID Collection (HVSC), zum Beispiel /media/C64Music/" #: src/sid/xmms-sid.glade:2810 #: src/sid/xs_interface.c:1164 msgid "Browse for HVSC path" -msgstr "" +msgstr "Nach HVSC-Pfad suchen" #: src/sid/xmms-sid.glade:2840 #: src/sid/xs_interface.c:1166 msgid "SID Tune Information List (STIL) database:" -msgstr "" +msgstr "SID Tune Information List (STIL)-Datenbank:" #: src/sid/xmms-sid.glade:2913 #: src/sid/xs_interface.c:1190 @@ -3941,7 +3964,7 @@ #: src/sid/xmms-sid.glade:2927 #: src/sid/xs_interface.c:1197 msgid "Cancel any changes" -msgstr "" +msgstr "Alle Änderungen verwerfen" #: src/sid/xmms-sid.glade:2952 #: src/sid/xs_interface.c:1474 @@ -5311,6 +5334,10 @@ "Some of the plugin code was by Miles Egan\n" "Visit the Wavpack site at http://www.wavpack.com/\n" msgstr "" +"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n" +"\n" +"Ein Teil des Plugin-Codes war von Miles Egan\n" +"Die Wavpack-Seite befindet sich auf http://www.wavpack.com/\n" #: src/wavpack/ui.cxx:163 msgid "Ape2 Tag" @@ -5328,7 +5355,7 @@ #: src/wavpack/ui.cxx:380 #, c-format msgid "average bitrate: %6.1f kbps" -msgstr "" +msgstr "durchschnittliche Bitrate: %6.1f kbps" #: src/wavpack/ui.cxx:381 #, c-format
--- a/src/CoreAudio/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/CoreAudio/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -25,7 +25,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message( + dialog = audacious_info_dialog( "About CoreAudio Plugin", "Audacious CoreAudio Plugin\n\n " "This program is free software; you can redistribute it and/or modify\n"
--- a/src/CoreAudio/audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/CoreAudio/audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -498,7 +498,7 @@ while (flush != -1) { - xmms_usleep(10000); + g_usleep(10000); } }
--- a/src/OSS/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/OSS/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -36,7 +36,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message(_("About OSS Driver"), + dialog = audacious_info_dialog(_("About OSS Driver"), _("Audacious OSS Driver\n\n " "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n"
--- a/src/OSS/audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/OSS/audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -305,7 +305,7 @@ #endif if (realtime && !ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) { while (abuf_info.bytes < length) { - xmms_usleep(10000); + g_usleep(10000); if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) break; } @@ -511,7 +511,7 @@ if (!realtime) { flush = time; while (flush != -1) - xmms_usleep(10000); + g_usleep(10000); } else { ioctl(fd, SNDCTL_DSP_RESET, 0); @@ -566,7 +566,7 @@ } } else - xmms_usleep(10000); + g_usleep(10000); oss_calc_device_buffer_used(); if (do_pause && !paused) { do_pause = FALSE;
--- a/src/OSS4/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/OSS4/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -39,7 +39,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message(_("About OSSv4 Driver"), + dialog = audacious_info_dialog(_("About OSSv4 Driver"), _("Audacious OSSv4 Driver\n\n" "Based on the OSSv3 Output plugin,\n" "Ported to OSSv4's VMIX by Cristi Magherusan <majeru@gentoo.ro>\n\n"
--- a/src/OSS4/audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/OSS4/audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -305,7 +305,7 @@ #endif if (realtime && !ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) { while (abuf_info.bytes < length) { - xmms_usleep(10000); + g_usleep(10000); if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &abuf_info)) break; } @@ -511,7 +511,7 @@ if (!realtime) { flush = time; while (flush != -1) - xmms_usleep(10000); + g_usleep(10000); } else { ioctl(fd, SNDCTL_DSP_RESET, 0); @@ -566,7 +566,7 @@ } } else - xmms_usleep(10000); + g_usleep(10000); oss_calc_device_buffer_used(); if (do_pause && !paused) { do_pause = FALSE;
--- a/src/aac/src/libmp4.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/aac/src/libmp4.c Sun Sep 09 23:23:00 2007 +0300 @@ -293,7 +293,7 @@ "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n" "Copyright (c) 2005-2006 Audacious team"), NULL); - aboutbox = xmms_show_message(_("About MP4 AAC player plugin"), + aboutbox = audacious_info_dialog(_("About MP4 AAC player plugin"), about_text, _("Ok"), FALSE, NULL, NULL); @@ -311,7 +311,7 @@ { seekPosition = time; while(buffer_playing && seekPosition != -1) - xmms_usleep(10000); + g_usleep(10000); } static void mp4_cleanup(void) @@ -549,7 +549,7 @@ /* Finish playing before we close the output. */ while ( playback->output->buffer_playing() ) { - xmms_usleep(10000); + g_usleep(10000); } playback->output->flush(seekPosition*1000);
--- a/src/adplug/adplug-xmms.cc Sun Sep 09 23:22:52 2007 +0300 +++ b/src/adplug/adplug-xmms.cc Sun Sep 09 23:23:00 2007 +0300 @@ -155,7 +155,7 @@ strcpy (tmptxt, text); strcpy (tmpbutton, button); - GtkWidget *msgbox = xmms_show_message (tmptitle, tmptxt, tmpbutton, FALSE, + GtkWidget *msgbox = audacious_info_dialog (tmptitle, tmptxt, tmpbutton, FALSE, G_CALLBACK (gtk_widget_destroyed), &msgbox); @@ -182,7 +182,7 @@ "Linked AdPlug library version: "), version_text, NULL); about_win = - xmms_show_message (about_title, about_text, _("Ok"), FALSE, NULL, NULL); + audacious_info_dialog (about_title, about_text, _("Ok"), FALSE, NULL, NULL); g_signal_connect (G_OBJECT (about_win), "destroy", G_CALLBACK (gtk_widget_destroyed), &about_win); g_free (about_text); @@ -853,7 +853,7 @@ // write sound buffer while (playback->output->buffer_free () < SNDBUFSIZE * sampsize) - xmms_usleep (10000); + g_usleep (10000); produce_audio (playback->output->written_time (), bit16 ? FORMAT_16 : FORMAT_8, stereo ? 2 : 1, SNDBUFSIZE * sampsize, sndbuf, NULL); @@ -869,7 +869,7 @@ { // wait for output plugin to finish if song has self-ended dbg_printf ("wait, "); while (playback->output->buffer_playing ()) - xmms_usleep (10000); + g_usleep (10000); } else { // or else, flush its output buffers
--- a/src/alac/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/alac/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -82,7 +82,7 @@ if(aboutbox != NULL) return; - aboutbox = xmms_show_message(_("About Apple Lossless Audio Plugin"), + aboutbox = audacious_info_dialog(_("About Apple Lossless Audio Plugin"), _("Copyright (c) 2006 Audacious team\n" "Portions (c) 2005-2006 David Hammerton <crazney -at- crazney.net>"), _("Ok"), FALSE, NULL, NULL);
--- a/src/alsa/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/alsa/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -26,7 +26,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message( + dialog = audacious_info_dialog( _("About ALSA Driver"), _("Audacious ALSA Driver\n\n " "This program is free software; you can redistribute it and/or modify\n"
--- a/src/alsa/audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/alsa/audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -155,7 +155,7 @@ while ((err = snd_pcm_resume(alsa_pcm)) == -EAGAIN) /* wait until suspend flag is released */ - xmms_usleep(1000000); + g_usleep(1000000); if (err < 0) { g_warning("alsa_handle_error(): " @@ -316,7 +316,7 @@ { flush_request = time; while (flush_request != -1) - xmms_usleep(10000); + g_usleep(10000); } static void parse_mixer_name(char *str, char **name, int *index) @@ -854,7 +854,7 @@ } } else - xmms_usleep(10000); + g_usleep(10000); if (pause_request != paused) alsa_do_pause(pause_request);
--- a/src/arts/arts.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/arts/arts.c Sun Sep 09 23:23:00 2007 +0300 @@ -19,7 +19,7 @@ if (dialog) return; - dialog = xmms_show_message(_("About aRts Output"), + dialog = audacious_info_dialog(_("About aRts Output"), _("aRts output plugin by " "H\303\245vard Kv\303\245len <havardk@xmms.org>\n" "Audacious port by Giacomo Lozito from develia.org"),
--- a/src/audiocompress/audacious-glue.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/audiocompress/audacious-glue.c Sun Sep 09 23:23:00 2007 +0300 @@ -100,7 +100,7 @@ "Simple dynamic range compressor for transparently\n" "keeping the volume level more or less consistent") , NULL ); - about_xmms_compress = xmms_show_message( _("About AudioCompress") , + about_xmms_compress = audacious_info_dialog( _("About AudioCompress") , about_text , _("Ok") , FALSE , NULL , NULL ); gtk_signal_connect( GTK_OBJECT(about_xmms_compress) , "destroy" , GTK_SIGNAL_FUNC(gtk_widget_destroyed), &about_xmms_compress );
--- a/src/cdaudio-ng/cdaudio-ng.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/cdaudio-ng/cdaudio-ng.c Sun Sep 09 23:23:00 2007 +0300 @@ -194,7 +194,7 @@ "Also thank you Tony Vroon for mentoring & guiding me.\n\n" "This was a Google Summer of Code 2007 project.")); - about_window = xmms_show_message(_("About CD Audio Plugin NG"), about_text, _("OK"), FALSE, NULL, NULL); + about_window = audacious_info_dialog(_("About CD Audio Plugin NG"), about_text, _("OK"), FALSE, NULL, NULL); g_signal_connect(G_OBJECT(about_window), "destroy", G_CALLBACK(gtk_widget_destroyed), &about_window);
--- a/src/console/Audacious_Driver.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/console/Audacious_Driver.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -492,7 +492,7 @@ if (!aboutbox) { - aboutbox = xmms_show_message(_("About the Console Music Decoder"), + aboutbox = audacious_info_dialog(_("About the Console Music Decoder"), _("Console music decoder engine based on Game_Music_Emu 0.5.2.\n" "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n" "Audacious implementation by: William Pitcock <nenolod@nenolod.net>, \n"
--- a/src/echo_plugin/gui.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/echo_plugin/gui.c Sun Sep 09 23:23:00 2007 +0300 @@ -23,7 +23,7 @@ if (echo_about_dialog != NULL) return; - echo_about_dialog = xmms_show_message(_("About Echo Plugin"), + echo_about_dialog = audacious_info_dialog(_("About Echo Plugin"), _(echo_about_text), _("Ok"), FALSE, NULL, NULL); gtk_signal_connect(GTK_OBJECT(echo_about_dialog), "destroy",
--- a/src/esd/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/esd/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -31,7 +31,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message(_("About ESounD Plugin"), + dialog = audacious_info_dialog(_("About ESounD Plugin"), _("Audacious ESounD Plugin\n\n " "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n"
--- a/src/filewriter/filewriter.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/filewriter/filewriter.c Sun Sep 09 23:23:00 2007 +0300 @@ -160,7 +160,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message(_("About FileWriter-Plugin"), + dialog = audacious_info_dialog(_("About FileWriter-Plugin"), _("FileWriter-Plugin\n\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -190,7 +190,7 @@ if (xmms_check_realtime_priority()) { - xmms_show_message(_("Error"), + audacious_info_dialog(_("Error"), _("You cannot use the FileWriter plugin\n" "when you're running in realtime mode."), _("OK"), FALSE, NULL, NULL);
--- a/src/flacng/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/flacng/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -614,7 +614,7 @@ seek_to = time; while (-1 != seek_to) { - xmms_usleep(10000); + g_usleep(10000); } _LEAVE; @@ -721,7 +721,7 @@ "\n" "http://www.skytale.net/projects/bmp-flac2/"), NULL); - about_window = xmms_show_message(_("About FLAC Audio Plugin"), + about_window = audacious_info_dialog(_("About FLAC Audio Plugin"), about_text, _("OK"), FALSE, NULL, NULL);
--- a/src/hotkey/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/hotkey/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -51,7 +51,7 @@ #include <audacious/i18n.h> -/* for xmms_show_message () */ +/* for audacious_info_dialog () */ #include <audacious/util.h> @@ -900,7 +900,7 @@ { static GtkWidget *dialog; - dialog = xmms_show_message (_("About Global Hotkey Plugin"), + dialog = audacious_info_dialog (_("About Global Hotkey Plugin"), _("Global Hotkey Plugin\n" "Control the player with global key combinations or multimedia keys.\n\n" "Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
--- a/src/jack/jack.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/jack/jack.c Sun Sep 09 23:23:00 2007 +0300 @@ -594,7 +594,7 @@ if ( aboutbox == NULL ) { - aboutbox = xmms_show_message( + aboutbox = audacious_info_dialog( _("About JACK Output Plugin 0.17"), _("XMMS jack Driver 0.17\n\n" "xmms-jack.sf.net\nChris Morgan<cmorgan@alum.wpi.edu>\n\n"
--- a/src/m3u/m3u.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/m3u/m3u.c Sun Sep 09 23:23:00 2007 +0300 @@ -166,7 +166,7 @@ if (cfg.use_pl_metadata) vfs_fprintf(file, "#EXTM3U\n"); - PLAYLIST_LOCK(playlist->mutex); + PLAYLIST_LOCK(playlist); for (node = playlist->entries; node; node = g_list_next(node)) { PlaylistEntry *entry = PLAYLIST_ENTRY(node->data); @@ -194,7 +194,7 @@ g_free(fn); } - PLAYLIST_UNLOCK(playlist->mutex); + PLAYLIST_UNLOCK(playlist); vfs_fclose(file); }
--- a/src/madplug/fileinfo.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/madplug/fileinfo.c Sun Sep 09 23:23:00 2007 +0300 @@ -155,7 +155,7 @@ /* read tag from file */ id3file = id3_file_open(info.filename, ID3_FILE_MODE_READWRITE); if (!id3file) { - xmms_show_message(_("File Info"), _("Couldn't open file!"), _("Ok"), + audacious_info_dialog(_("File Info"), _("Couldn't open file!"), _("Ok"), FALSE, NULL, NULL); return; } @@ -233,7 +233,7 @@ printf("about to write id3tag\n"); #endif if (id3_file_update(id3file) != 0) { - xmms_show_message(_("File Info"), _("Couldn't write tag!"), _("Ok"), FALSE, + audacious_info_dialog(_("File Info"), _("Couldn't write tag!"), _("Ok"), FALSE, NULL, NULL); } id3_file_close(id3file);
--- a/src/madplug/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/madplug/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -592,7 +592,7 @@ MAD_VERSION_MAJOR, MAD_VERSION_MINOR, MAD_VERSION_PATCH, MAD_VERSION_EXTRA); - aboutbox = xmms_show_message(_("About MPEG Audio Plugin"), + aboutbox = audacious_info_dialog(_("About MPEG Audio Plugin"), scratch, _("Ok"), FALSE, NULL, NULL); @@ -617,7 +617,7 @@ va_end(args); GDK_THREADS_ENTER(); error_dialog = - xmms_show_message(_("Error"), string, _("Ok"), FALSE, 0, 0); + audacious_info_dialog(_("Error"), string, _("Ok"), FALSE, 0, 0); gtk_signal_connect(GTK_OBJECT(error_dialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &error_dialog);
--- a/src/metronom/metronom.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/metronom/metronom.c Sun Sep 09 23:23:00 2007 +0300 @@ -82,7 +82,7 @@ static void metronom_about(void) { static GtkWidget *box; - box = xmms_show_message( + box = audacious_info_dialog( _("About Metronom"), _("A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nTo use it, add a URL: tact://beats*num/den\ne.g. tact://77 to play 77 beats per minute\nor tact://60*3/4 to play 60 bpm in 3/4 tacts"), _("Ok"), FALSE, NULL, NULL); @@ -148,7 +148,7 @@ t++; } while(playback->output->buffer_free() < BUF_BYTES && going) - xmms_usleep(30000); + g_usleep(30000); if (going) produce_audio(playback->output->written_time(), FMT_S16_LE, 1, BUF_BYTES, data, &going); }
--- a/src/modplug/gui/main.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/modplug/gui/main.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -45,7 +45,7 @@ { 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 = xmms_show_message( _("About Modplug") , about_text , _("Ok") , FALSE , NULL , 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 );
--- a/src/mtp_up/mtp.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/mtp_up/mtp.c Sun Sep 09 23:23:00 2007 +0300 @@ -110,7 +110,7 @@ Playlist *current_play = playlist_get_active(); node = current_play->entries; - PLAYLIST_LOCK(current_play->mutex); /*needed so that the user doesn't modify the selection*/ + PLAYLIST_LOCK(current_play); /*needed so that the user doesn't modify the selection*/ while (node) /*while creating the list of files to be uploaded*/ { entry = PLAYLIST_ENTRY(node->data); @@ -122,7 +122,7 @@ } node = g_list_next(node); } - PLAYLIST_UNLOCK(current_play->mutex); + PLAYLIST_UNLOCK(current_play); return g_list_reverse(up_list); }
--- a/src/musepack/libmpc.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/musepack/libmpc.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -146,7 +146,7 @@ char* titleText = g_strdup_printf(_("Musepack Decoder Plugin 1.2")); const char* contentText = _("Plugin code by\nBenoit Amiaux\nMartin Spuler\nKuniklo\n\nGet latest version at http://musepack.net\n"); const char* buttonText = _("Nevermind"); - aboutBox = xmms_show_message(titleText, contentText, buttonText, FALSE, NULL, NULL); + aboutBox = audacious_info_dialog(titleText, contentText, buttonText, FALSE, NULL, NULL); widgets.aboutBox = aboutBox; g_signal_connect(G_OBJECT(aboutBox), "destroy", G_CALLBACK(gtk_widget_destroyed), &widgets.aboutBox); } @@ -865,7 +865,7 @@ else { lockRelease(); - xmms_usleep(10000); + g_usleep(10000); } } return endThread(filename, input, false);
--- a/src/null/null.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/null/null.c Sun Sep 09 23:23:00 2007 +0300 @@ -62,7 +62,7 @@ _(" by Christian Birchinger <joker@netswarm.net>\n" "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"), NULL); - about = xmms_show_message(_("About Null Output"), + about = audacious_info_dialog(_("About Null Output"), about_text, _("Ok"), FALSE, NULL, NULL);
--- a/src/paranormal/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/paranormal/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -261,7 +261,7 @@ static void pn_xmms_about (void) { - xmms_show_message("About Paranormal Visualization Studio", + audacious_info_dialog("About Paranormal Visualization Studio", "Paranormal Visualization Studio " VERSION "\n\n\ Copyright (C) 2006, William Pitcock <nenolod -at- nenolod.net>\n\
--- a/src/pls/pls.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/pls/pls.c Sun Sep 09 23:23:00 2007 +0300 @@ -110,7 +110,7 @@ vfs_fprintf(file, "[playlist]\n"); vfs_fprintf(file, "NumberOfEntries=%d\n", playlist_get_length(playlist)); - PLAYLIST_LOCK(playlist->mutex); + PLAYLIST_LOCK(playlist); for (node = playlist->entries; node; node = g_list_next(node)) { PlaylistEntry *entry = PLAYLIST_ENTRY(node->data); @@ -127,7 +127,7 @@ g_free(fn); } - PLAYLIST_UNLOCK(playlist->mutex); + PLAYLIST_UNLOCK(playlist); vfs_fclose(file); }
--- a/src/pulse_audio/pulse_audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/pulse_audio/pulse_audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -674,7 +674,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message( + dialog = audacious_info_dialog( _("About Audacious PulseAudio Output Plugin"), _("Audacious PulseAudio Output Plugin\n\n " "This program is free software; you can redistribute it and/or modify\n"
--- a/src/rovascope/plugin.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/rovascope/plugin.c Sun Sep 09 23:23:00 2007 +0300 @@ -262,7 +262,7 @@ static void pn_xmms_about (void) { - xmms_show_message("About Rovascope", + audacious_info_dialog("About Rovascope", "Rovascope " VERSION "\n\n\ Copyright (C) 2007, William Pitcock <nenolod -at- dereferenced.org>\n\
--- a/src/scrobbler/gtkstuff.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/scrobbler/gtkstuff.c Sun Sep 09 23:23:00 2007 +0300 @@ -19,7 +19,7 @@ tmp = g_strdup_printf(_("Audacious AudioScrobbler Plugin\n\n" "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n")); - aboutbox = xmms_show_message(_("About Scrobbler Plugin"), + aboutbox = audacious_info_dialog(_("About Scrobbler Plugin"), tmp, _("Ok"), FALSE, NULL, NULL); @@ -38,7 +38,7 @@ "%s\n"), errortxt); - xmms_show_message(_("Scrobbler Error"), + audacious_info_dialog(_("Scrobbler Error"), tmp, _("OK"), FALSE, NULL, NULL); g_free(tmp);
--- a/src/shnplug/gtk.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/shnplug/gtk.c Sun Sep 09 23:23:00 2007 +0300 @@ -82,7 +82,7 @@ return; } - about_box = xmms_show_message( + about_box = audacious_info_dialog( (gchar *) "About " PACKAGE, (gchar *) PACKAGE " version " VERSION "\n" "Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>\n"
--- a/src/shnplug/shn.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/shnplug/shn.c Sun Sep 09 23:23:00 2007 +0300 @@ -796,7 +796,7 @@ this_shn->wave_header.channels, bytes_to_write, this_shn->vars.buffer); while(shn_ip.output->buffer_free() < bytes_to_write && playback->playing && this_shn->vars.seek_to == -1) - xmms_usleep(10000); + g_usleep(10000); if(playback->playing && this_shn->vars.seek_to == -1) { if (shn_cfg.swap_bytes) @@ -1187,7 +1187,7 @@ goto restart; } else - xmms_usleep(10000); + g_usleep(10000); } goto cleanup; @@ -1227,7 +1227,7 @@ write_and_wait(this_shn,this_shn->vars.bytes_in_buf); shn_ip.output->buffer_free(); shn_ip.output->buffer_free(); - xmms_usleep(10000); + g_usleep(10000); finish: @@ -1328,7 +1328,7 @@ shnfile->vars.seek_to = time; while (shnfile->vars.seek_to != -1) - xmms_usleep(10000); + g_usleep(10000); } static void shn_get_file_info(char *filename, char **title, int *length)
--- a/src/sid/xmms-sid.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/sid/xmms-sid.c Sun Sep 09 23:23:00 2007 +0300 @@ -526,7 +526,7 @@ /* Wait a little */ while (xs_status.isPlaying && (pb->output->buffer_free() < audioGot)) - xmms_usleep(500); + g_usleep(500); /* Check if we have played enough */ XS_MUTEX_LOCK(xs_status);
--- a/src/statusicon/si_ui.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/statusicon/si_ui.c Sun Sep 09 23:23:00 2007 +0300 @@ -574,7 +574,7 @@ "This plugin provides a status icon, placed in\n" "the system tray area of the window manager.\n") , NULL ); - about_dlg = xmms_show_message( about_title , about_text , _("Ok") , FALSE , NULL , NULL ); + about_dlg = audacious_info_dialog( about_title , about_text , _("Ok") , FALSE , NULL , NULL ); g_signal_connect( G_OBJECT(about_dlg) , "destroy" , G_CALLBACK(gtk_widget_destroyed), &about_dlg ); g_free( about_text );
--- a/src/stereo_plugin/stereo.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/stereo_plugin/stereo.c Sun Sep 09 23:23:00 2007 +0300 @@ -49,7 +49,7 @@ if (about_dialog != NULL) return; - about_dialog = xmms_show_message(_("About Extra Stereo Plugin"), + about_dialog = audacious_info_dialog(_("About Extra Stereo Plugin"), _(about_text), _("Ok"), FALSE, NULL, NULL); gtk_signal_connect(GTK_OBJECT(about_dialog), "destroy",
--- a/src/sun/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/sun/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -30,7 +30,7 @@ if (dialog != NULL) return; - dialog = xmms_show_message( + dialog = audacious_info_dialog( _("About the Sun Driver"), _("XMMS BSD Sun Driver\n\n" "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
--- a/src/sun/audio.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/sun/audio.c Sun Sep 09 23:23:00 2007 +0300 @@ -501,7 +501,7 @@ } } else - xmms_usleep(10000); + g_usleep(10000); sun_bufused();
--- a/src/sun/configure.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/sun/configure.c Sun Sep 09 23:23:00 2007 +0300 @@ -443,7 +443,7 @@ gtk_label_set_text(GTK_LABEL(stats_frame.ooffs_label), sl); pthread_mutex_unlock(&stats_frame.audioctl_mutex); - xmms_usleep(400000); + g_usleep(400000); } pthread_mutex_unlock(&stats_frame.active_mutex);
--- a/src/timidity/src/xmms-timidity.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/timidity/src/xmms-timidity.c Sun Sep 09 23:23:00 2007 +0300 @@ -117,7 +117,7 @@ about_text = g_strjoin( "" , _("TiMidity Plugin\nhttp://libtimidity.sourceforge.net\nby Konstantin Korikov") , NULL ); about_title = g_strdup_printf( _("TiMidity Plugin %s") , PACKAGE_VERSION ); - xmmstimid_about_wnd = xmms_show_message( about_title , about_text , _("Ok") , FALSE , NULL , NULL ); + xmmstimid_about_wnd = audacious_info_dialog( about_title , about_text , _("Ok") , FALSE , NULL , NULL ); g_signal_connect(G_OBJECT(xmmstimid_about_wnd), "destroy", (GCallback)gtk_widget_destroyed, &xmmstimid_about_wnd); g_free(about_title); @@ -382,7 +382,7 @@ playback->eof = FALSE; while (xmmstimid_seek_to != -1) - xmms_usleep(10000); + g_usleep(10000); } int xmmstimid_get_time(InputPlayback * playback) {
--- a/src/tonegen/tonegen.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/tonegen/tonegen.c Sun Sep 09 23:23:00 2007 +0300 @@ -52,7 +52,7 @@ static GtkWidget *box; if (!box) { - box = xmms_show_message( + box = audacious_info_dialog( _("About Tone Generator"), /* I18N: UTF-8 Translation: "Haavard Kvaalen" -> "H\303\245vard Kv\303\245len" */ _("Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n" @@ -115,7 +115,7 @@ (sum_sines / frequencies->len)); } while (playback->output->buffer_free() < BUF_BYTES && going) - xmms_usleep(30000); + g_usleep(30000); produce_audio(playback->output->written_time(), FMT_S16_NE, 1, BUF_BYTES, data, &going); }
--- a/src/tta/libtta.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/tta/libtta.c Sun Sep 09 23:23:00 2007 +0300 @@ -151,7 +151,7 @@ break; } - xmms_show_message (_("TTA Decoder Error"), message, + audacious_info_dialog (_("TTA Decoder Error"), message, _("Ok"), FALSE, NULL, NULL); gtk_signal_connect(GTK_OBJECT(errorbox), "destroy", @@ -199,7 +199,7 @@ { if (!playback->playing) goto DONE; - xmms_usleep (10000); + g_usleep (10000); } if (seek_position == -1) { @@ -223,7 +223,7 @@ playback->output->buffer_free (); playback->output->buffer_free (); while (playback->output->buffer_playing()) { - xmms_usleep(10000); + g_usleep(10000); if(!playback->playing) goto DONE; } @@ -264,7 +264,7 @@ _(" for BMP\n" "Copyright (c) 2004 True Audio Software\n"), PROJECT_URL, NULL); - aboutbox = xmms_show_message(_("About True Audio Plugin"), + aboutbox = audacious_info_dialog(_("About True Audio Plugin"), about_text, _("Ok"), FALSE, NULL, NULL); @@ -537,7 +537,7 @@ seek_position = (int)(millisec / SEEK_STEP); while (seek_position != -1) - xmms_usleep (10000); + g_usleep (10000); } }
--- a/src/vorbis/fileinfo.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/vorbis/fileinfo.c Sun Sep 09 23:23:00 2007 +0300 @@ -209,7 +209,7 @@ gchar *errorstring; errorstring = g_strdup_printf(_("An error occured:\n%s"), error); - xmms_show_message(_("Error!"), errorstring, _("Ok"), FALSE, NULL, NULL); + audacious_info_dialog(_("Error!"), errorstring, _("Ok"), FALSE, NULL, NULL); g_free(errorstring); return;
--- a/src/vorbis/vorbis.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/vorbis/vorbis.c Sun Sep 09 23:23:00 2007 +0300 @@ -497,7 +497,7 @@ do_seek(playback); if (playback->eof) { - xmms_usleep(20000); + g_usleep(20000); continue; } @@ -585,7 +585,7 @@ seekneeded = time; while (seekneeded != -1) - xmms_usleep(20000); + g_usleep(20000); } static void @@ -843,7 +843,7 @@ gdk_window_raise(about_window->window); else { - about_window = xmms_show_message(_("About Ogg Vorbis Audio Plugin"), + about_window = audacious_info_dialog(_("About Ogg Vorbis Audio Plugin"), /* * I18N: UTF-8 Translation: "Haavard Kvaalen" -> * "H\303\245vard Kv\303\245len"
--- a/src/vtx/about.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/vtx/about.c Sun Sep 09 23:23:00 2007 +0300 @@ -19,7 +19,7 @@ static GtkWidget *box; if (box) gdk_window_raise(box->window); else { - box = xmms_show_message (_("About Vortex Player"), + box = audacious_info_dialog (_("About Vortex Player"), _ ("Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n" "Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
--- a/src/vtx/info.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/vtx/info.c Sun Sep 09 23:23:00 2007 +0300 @@ -38,7 +38,7 @@ "Player Freq:%P\n" "Year: %y"); - box = xmms_show_message (head, + box = audacious_info_dialog (head, body, _("Ok"), FALSE, NULL, NULL);
--- a/src/wav/wav-sndfile.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wav/wav-sndfile.c Sun Sep 09 23:23:00 2007 +0300 @@ -496,7 +496,7 @@ seek_time = (glong)millisecond; while (seek_time != -1) - xmms_usleep (80000); + g_usleep (80000); } static void @@ -526,7 +526,7 @@ static GtkWidget *box; if (!box) { - box = xmms_show_message( + box = audacious_info_dialog( _("About sndfile WAV support"), _("Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n" "from the xmms_sndfile plugin which is:\n"
--- a/src/wav/wav.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wav/wav.c Sun Sep 09 23:23:00 2007 +0300 @@ -436,7 +436,7 @@ playback->eof = FALSE; while (wav_file->seek_to != -1) - xmms_usleep(10000); + g_usleep(10000); } static void
--- a/src/wavpack/libwavpack.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wavpack/libwavpack.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -358,7 +358,7 @@ } } else { - xmms_usleep(10000); + g_usleep(10000); } } return end_thread();
--- a/src/wavpack/tags.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wavpack/tags.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -310,7 +310,7 @@ sprintf(text, "File \"%s\" not found or is read protected!\n", filename); - xmms_show_message("File-Error", (gchar *) text, "Ok", FALSE, NULL, + audacious_info_dialog("File-Error", (gchar *) text, "Ok", FALSE, NULL, NULL); return -1; } @@ -385,7 +385,7 @@ snprintf(text, 256, "File \"%s\" not found or is read protected!\n", filename); - xmms_show_message("File-Error", (gchar *) text, "Ok", FALSE, NULL, + audacious_info_dialog("File-Error", (gchar *) text, "Ok", FALSE, NULL, NULL); return -1; }
--- a/src/wavpack/ui.cxx Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wavpack/ui.cxx Sun Sep 09 23:23:00 2007 +0300 @@ -48,7 +48,7 @@ gdk_window_raise(about_window->window); about_window = - xmms_show_message(g_strdup_printf + audacious_info_dialog(g_strdup_printf (_("Wavpack Decoder Plugin %s"), VERSION), (_("Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n\n" "Some of the plugin code was by Miles Egan\n"
--- a/src/wma/wma.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/wma/wma.c Sun Sep 09 23:23:00 2007 +0300 @@ -232,7 +232,7 @@ { wma_seekpos = time; if(wma_pause) playback->output->pause(0); - while(wma_decode && wma_seekpos!=-1) xmms_usleep(10000); + while(wma_decode && wma_seekpos!=-1) g_usleep(10000); if(wma_pause) playback->output->pause(1); } @@ -334,7 +334,7 @@ { sst_buff = wma_st_buff; if(wma_pause) memset(wma_s_outbuf, 0, sst_buff); - while(playback->output->buffer_free() < wma_st_buff) xmms_usleep(20000); + while(playback->output->buffer_free() < wma_st_buff) g_usleep(20000); produce_audio(playback->output->written_time(), FMT_S16_NE, c->channels, sst_buff, (short *)wma_s_outbuf, NULL); memset(wma_s_outbuf, 0, sst_buff); @@ -381,7 +381,7 @@ if(pkt.data) av_free_packet(&pkt); } } - while(playback->playing && playback->output->buffer_playing()) xmms_usleep(30000); + while(playback->playing && playback->output->buffer_playing()) g_usleep(30000); playback->playing = 0; if(wma_s_outbuf) g_free(wma_s_outbuf); if(wma_outbuf) g_free(wma_outbuf);
--- a/src/xspf/xspf.c Sun Sep 09 23:22:52 2007 +0300 +++ b/src/xspf/xspf.c Sun Sep 09 23:23:00 2007 +0300 @@ -371,7 +371,7 @@ xmlSetProp(rootnode, (xmlChar *)"version", (xmlChar *)"1"); xmlSetProp(rootnode, (xmlChar *)"xmlns", (xmlChar *)XSPF_XMLNS); - PLAYLIST_LOCK(playlist->mutex); + PLAYLIST_LOCK(playlist); /* relative */ if (playlist->attribute & PLAYLIST_USE_RELATIVE) { @@ -562,7 +562,7 @@ filename = NULL; } - PLAYLIST_UNLOCK(playlist->mutex); + PLAYLIST_UNLOCK(playlist); xmlSaveFormatFile(filename, doc, 1); xmlFreeDoc(doc);