moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-23 01:32:22 -05:00
Code Issues Releases Wiki Activity

Use canberra for files

Browse Source
This commit is contained in:
TingPing 2013-04-27 20:02:27 -03:00
parent 012105e115
commit bc1169e979
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/text.c
View File

@ -47,6 +47,10 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef USE_LIBCANBERRA
#include <canberra.h>
#endif
struct pevt_stage1 struct pevt_stage1
{ {
int len; int len;
@ -2198,28 +2202,6 @@ sound_beep (session *sess)
} }
} }
static char *
sound_find_command (void)
{
/* some sensible unix players. You're bound to have one of them */
static const char * const progs[] = {"play", "paplay", "aplay", "esdplay", "artsplay", NULL};
char *cmd;
int i = 0;
if (prefs.hex_sound_command[0])
return g_strdup (prefs.hex_sound_command);
while (progs[i])
{
cmd = g_find_program_in_path (progs[i]);
if (cmd)
return cmd;
i++;
}
return NULL;
}
void void
sound_play (const char *file, gboolean quiet) sound_play (const char *file, gboolean quiet)
{ {
@ -2227,7 +2209,11 @@ sound_play (const char *file, gboolean quiet)
char *wavfile; char *wavfile;
#ifndef WIN32 #ifndef WIN32
char *cmd; char *cmd;
#ifdef USE_LIBCANBERRA
ca_context *con;
#endif #endif
#endif
/* the pevents GUI editor triggers this after removing a soundfile */ /* the pevents GUI editor triggers this after removing a soundfile */
if (!file[0]) if (!file[0])
@ -2254,7 +2240,17 @@ sound_play (const char *file, gboolean quiet)
#ifdef WIN32 #ifdef WIN32
PlaySound (wavfile, NULL, SND_NODEFAULT|SND_FILENAME|SND_ASYNC); PlaySound (wavfile, NULL, SND_NODEFAULT|SND_FILENAME|SND_ASYNC);
#else #else
cmd = sound_find_command (); #ifdef USE_LIBCANBERRA
ca_context_create (&con);
/* TODO: Volume setting? */
if (ca_context_play (con, 0,
CA_PROP_MEDIA_FILENAME, wavfile, NULL) == 0)
{
g_free (wavfile);
return;
}
#endif
cmd = g_find_program_in_path ("play");
if (cmd) if (cmd)
{ {