Mercurial > pidgin

diff src/gtkconv.c @ 4561:9df99116840a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4842] This is the new sound subsystem Lots of stuff got renamed, and everything sound-wise is documented. Gaim now uses libaudiofile and libao to play sounds. Lots of ugly hacks were removed, and now we support playing audio through anything that libao will support. If you need to (you shouldn't) you can force libao to use a specific output driver, by putting a line into ~/.libao like: default_driver=esd You shouldn't need to do this, libao is pretty good at figuring out what driver to use. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sun, 09 Feb 2003 01:55:35 +0000
parents e5b024352f9e
children 51e988d015ed
line wrap: on
line diff
--- a/src/gtkconv.c	Sun Feb 09 00:47:57 2003 +0000
+++ b/src/gtkconv.c	Sun Feb 09 01:55:35 2003 +0000
@@ -43,6 +43,7 @@
 #include "prpl.h"
 #include "gtkimhtml.h"
 #include "dnd-hints.h"
+#include "sound.h"
 
 #ifdef _WIN32
 #include "win32dep.h"
@@ -3619,13 +3620,13 @@
 			if (gtkconv->u.im->a_virgin &&
 				(sound_options & OPT_SOUND_FIRST_RCV)) {
 
-				play_sound(SND_FIRST_RECEIVE);
+				gaim_sound_play_event(GAIM_SOUND_FIRST_RECEIVE);
 			}
 			else
-				play_sound(SND_RECEIVE);
+				gaim_sound_play_event(GAIM_SOUND_RECEIVE);
 		}
 		else {
-			play_sound(SND_SEND);
+			gaim_sound_play_event(GAIM_SOUND_SEND);
 		}
 	}
 
@@ -3645,12 +3646,12 @@
 	/* Play a sound, if specified in prefs. */
 	if (gtkconv->make_sound) {
 		if (!(flags & WFLAG_WHISPER) && (flags & WFLAG_SEND))
-			play_sound(SND_CHAT_YOU_SAY);
+			gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY);
 		else if (flags & WFLAG_RECV) {
 			if ((flags & WFLAG_NICK) && (sound_options & OPT_SOUND_CHAT_NICK))
-				play_sound(SND_CHAT_NICK);
+				gaim_sound_play_event(GAIM_SOUND_CHAT_NICK);
 			else
-				play_sound(SND_CHAT_SAY);
+				gaim_sound_play_event(GAIM_SOUND_CHAT_SAY);
 		}
 	}
 
@@ -3944,7 +3945,7 @@
 	gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp);
 
 	if (gtkconv->make_sound)
-		play_sound(SND_CHAT_JOIN);
+		gaim_sound_play_event(GAIM_SOUND_CHAT_JOIN);
 
 	pos = g_list_index(gaim_chat_get_users(chat), user);
 
@@ -4063,7 +4064,7 @@
 	gtk_label_set_text(GTK_LABEL(gtkchat->count), tmp);
 
 	if (gtkconv->make_sound)
-		play_sound(SND_CHAT_LEAVE);
+		gaim_sound_play_event(GAIM_SOUND_CHAT_LEAVE);
 }
 
 static void