Mercurial > pidgin

changeset 4012:ab6c48a07fd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4212] Fixed this filename madness. Robot101 is going to fix arts and nas and send me a patch whilst I eat dinner. Herman (or Rob) you'll want to fix the win32 stuff accordingly, I presume. This is not the end of the world. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Thu, 28 Nov 2002 02:03:38 +0000
parents a870a2a0bc5b
children 73853a0a1a77
files sounds/BuddyArrive.au sounds/BuddyArrive.wav sounds/BuddyLeave.au sounds/BuddyLeave.wav sounds/Makefile.am sounds/Receive.au sounds/Receive.wav sounds/RedAlert.au sounds/RedAlert.wav sounds/Send.au sounds/Send.wav sounds/arrive.wav sounds/au2h.c sounds/leave.wav sounds/receive.wav sounds/redalert.wav sounds/send.wav src/sound.c
diffstat 18 files changed, 24 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
Binary file sounds/BuddyArrive.au has changed
Binary file sounds/BuddyArrive.wav has changed
Binary file sounds/BuddyLeave.au has changed
Binary file sounds/BuddyLeave.wav has changed
--- a/sounds/Makefile.am	Thu Nov 28 00:21:24 2002 +0000
+++ b/sounds/Makefile.am	Thu Nov 28 02:03:38 2002 +0000
@@ -1,8 +1,8 @@
-EXTRA_DIST =	BuddyArrive.wav \
-		BuddyLeave.wav \
-		Receive.wav \
-		RedAlert.wav \
-		Send.wav
+EXTRA_DIST =	buddyarrive.wav \
+		buddyleave.wav \
+		receive.wav \
+		redalert.wav \
+		send.wav
 
 soundsdir =	$(datadir)/sounds/gaim
 sounds_DATA =	$(EXTRA_DIST)
Binary file sounds/Receive.au has changed
Binary file sounds/Receive.wav has changed
Binary file sounds/RedAlert.au has changed
Binary file sounds/RedAlert.wav has changed
Binary file sounds/Send.au has changed
Binary file sounds/Send.wav has changed
Binary file sounds/arrive.wav has changed
--- a/sounds/au2h.c	Thu Nov 28 00:21:24 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#include <stdio.h>
-#if !(__GLIBC__ < 2)
-#include <error.h>
-#endif
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define BUF_SIZE 10
-
-int main(int argc, char *argv[])
-{
-	int fd;
-	FILE *f;
-	int res,x;
-	char buf[BUF_SIZE];
-	char file[256];
-	int offset = 0, cnt;
-
-	if (argc != 3) {
-		fprintf(stderr, "Too few arguments! Are you using gmake? If you're not, then you really should. :-) \n");
-		exit(1);
-	}
-
-	fd = open(argv[1], O_RDONLY);
-	if (fd < 0) {
-		perror("open");
-		exit(1);
-	}
-	f = fopen(argv[2], "w+");
-	if (!f) {
-		perror("fopen");
-		exit(1);
-	}
-	argv[1][strlen(argv[1])-3]='\0';
-	cnt = strlen(argv[1]);
-	while (offset != cnt) {
-		if (argv[1][cnt - offset] == '/') {
-			offset--;
-			break;
-		}
-		offset++;
-	}
-	sprintf(file, "%s", &argv[1][cnt - offset]);
-	fprintf(f, "static unsigned char %s[] = {\n", file);
-	read(fd, buf, 8); /* id & offset */
-	read(fd, buf, 8); /* len & encoding */
-	read(fd, buf, 8); /* rate & count */
-	/*  no more click :) */
-	
-	while((res = read(fd, buf, BUF_SIZE)) > 0) {
-		for (x=0;x<res;x++)
-			fprintf(f, "%#x, ", buf[x] & 0xff);
-		fprintf(f, "\n");
-	}
-	fprintf(f,"};\n");
-	fclose(f);
-	return 0;
-}
Binary file sounds/leave.wav has changed
Binary file sounds/receive.wav has changed
Binary file sounds/redalert.wav has changed
Binary file sounds/send.wav has changed
--- a/src/sound.c	Thu Nov 28 00:21:24 2002 +0000
+++ b/src/sound.c	Thu Nov 28 02:03:38 2002 +0000
@@ -44,6 +44,14 @@
 #include <esd.h>
 #endif
 
+#ifdef ARTSC_SOUND
+#include <artsc.h>
+#endif
+
+#ifdef NAS_SOUND
+#include <audio/audiolib.h>
+#endif
+
 #include "gaim.h"
 
 gboolean mute_sounds = 0;
@@ -54,18 +62,18 @@
  * it has no option bit, set it to 0. the order here has to match *
  * the defines in gaim.h.                               -Robot101 */
 struct sound_struct sounds[NUM_SOUNDS] = {
-	{N_("Buddy logs in"), OPT_SOUND_LOGIN, "BuddyArrive.wav"},
-	{N_("Buddy logs out"), OPT_SOUND_LOGOUT, "BuddyLeave.wav"},
-	{N_("Message received"), OPT_SOUND_RECV, "Receive.wav"},
-	{N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, "Receive.wav"},
-	{N_("Message sent"), OPT_SOUND_SEND, "Send.wav"},
-	{N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, "BuddyArrive.wav"},
-	{N_("Person leaves chat"), OPT_SOUND_CHAT_PART, "BuddyLeave.wav"},
-	{N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, "Send.wav"},
-	{N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, "Receive.wav"},
+	{N_("Buddy logs in"), OPT_SOUND_LOGIN, "buddyarrive.wav"},
+	{N_("Buddy logs out"), OPT_SOUND_LOGOUT, "buddyleave.wav"},
+	{N_("Message received"), OPT_SOUND_RECV, "receive.wav"},
+	{N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, "receive.wav"},
+	{N_("Message sent"), OPT_SOUND_SEND, "send.wav"},
+	{N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, "buddyarrive.wav"},
+	{N_("Person leaves chat"), OPT_SOUND_CHAT_PART, "buddyleave.wav"},
+	{N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, "send.wav"},
+	{N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, "receive.wav"},
 	/* this isn't a terminator, it's the buddy pounce default sound event ;-) */
-	{NULL, 0, "RedAlert.wav"},
-	{N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, "RedAlert.wav"}
+	{NULL, 0, "redalert.wav"},
+	{N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, "redalert.wav"}
 };
 int sound_order[] = {
 	SND_BUDDY_ARRIVE, SND_BUDDY_LEAVE,