Mercurial > audlegacy-plugins

changeset 1678:923615bf2f2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Sep 2007 23:02:17 +0300
parents f6f5603a0954 (diff) 6a5e0d24a474 (current diff)
children 7398400de204 f35f9d6fcb6d
files
diffstat 56 files changed, 94 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/src/CoreAudio/about.c	Sun Sep 09 21:47:29 2007 +0200
+++ b/src/CoreAudio/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/CoreAudio/audio.c	Sun Sep 09 23:02:17 2007 +0300
@@ -498,7 +498,7 @@
 
 	while (flush != -1)
 	{
-		xmms_usleep(10000);
+		g_usleep(10000);
 	}
 }
 
--- a/src/OSS/about.c	Sun Sep 09 21:47:29 2007 +0200
+++ b/src/OSS/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/OSS/audio.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/OSS4/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/OSS4/audio.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/aac/src/libmp4.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/adplug/adplug-xmms.cc	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/alac/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/alsa/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/alsa/audio.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/arts/arts.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/audiocompress/audacious-glue.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/cdaudio-ng/cdaudio-ng.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/console/Audacious_Driver.cxx	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/echo_plugin/gui.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/esd/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/filewriter/filewriter.c	Sun Sep 09 23:02:17 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"
@@ -189,7 +189,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 21:47:29 2007 +0200
+++ b/src/flacng/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/hotkey/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/jack/jack.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/m3u/m3u.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/madplug/fileinfo.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/madplug/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/metronom/metronom.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/modplug/gui/main.cxx	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/mtp_up/mtp.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/musepack/libmpc.cxx	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/null/null.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/paranormal/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/pls/pls.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/pulse_audio/pulse_audio.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/rovascope/plugin.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/scrobbler/gtkstuff.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/shnplug/gtk.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/shnplug/shn.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/sid/xmms-sid.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/statusicon/si_ui.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/stereo_plugin/stereo.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/sun/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/sun/audio.c	Sun Sep 09 23:02:17 2007 +0300
@@ -501,7 +501,7 @@
 			}
 		}
 		else
-			xmms_usleep(10000);
+			g_usleep(10000);
 
 		sun_bufused();
 
--- a/src/sun/configure.c	Sun Sep 09 21:47:29 2007 +0200
+++ b/src/sun/configure.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/timidity/src/xmms-timidity.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/tonegen/tonegen.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/tta/libtta.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/vorbis/fileinfo.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/vorbis/vorbis.c	Sun Sep 09 23:02:17 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
@@ -845,7 +845,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 21:47:29 2007 +0200
+++ b/src/vtx/about.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/vtx/info.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/wav/wav-sndfile.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/wav/wav.c	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/wavpack/libwavpack.cxx	Sun Sep 09 23:02:17 2007 +0300
@@ -358,7 +358,7 @@
             }
         }
         else {
-            xmms_usleep(10000);
+            g_usleep(10000);
         }
     }
     return end_thread();
--- a/src/wavpack/tags.cxx	Sun Sep 09 21:47:29 2007 +0200
+++ b/src/wavpack/tags.cxx	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/wavpack/ui.cxx	Sun Sep 09 23:02:17 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 21:47:29 2007 +0200
+++ b/src/wma/wma.c	Sun Sep 09 23:02:17 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);
 }
 
@@ -338,7 +338,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);
@@ -385,7 +385,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 21:47:29 2007 +0200
+++ b/src/xspf/xspf.c	Sun Sep 09 23:02:17 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) {
@@ -561,7 +561,7 @@
         filename = NULL;
     }
 
-    PLAYLIST_UNLOCK(playlist->mutex);
+    PLAYLIST_UNLOCK(playlist);
 
     xmlSaveFormatFile(filename, doc, 1);
     xmlFreeDoc(doc);