deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-12 16:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of bundled beep

Browse Source
This commit is contained in:
Berke Viktor
2013-04-27 23:00:18 +02:00
parent 8e3db00dac
commit 6001ceff9f
15 changed files with 20 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/cfgfiles.c
View File

@@ -23,8 +23,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <gio/gio.h>
#include "hexchat.h"
#include "cfgfiles.h"
#include "util.h"
@@ -628,8 +626,6 @@ load_config (void)
#ifdef WIN32
char out[256];
#endif
GFile *beepsrc;
GFile *beepdest;
check_prefs_dir ();
username = g_get_user_name ();
@@ -847,23 +843,7 @@ load_config (void)
g_free (buf);
buf = g_build_filename (get_xdir (), "sounds", NULL);
if (g_mkdir (buf, 0700) == 0)
{
g_free (buf);
buf = g_build_filename (get_xdir (), "sounds", "beep.wav", NULL);
#ifdef WIN32 /* keep this in sync with fe-gtk.c! */
beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S "sounds" G_DIR_SEPARATOR_S "beep.wav");
#else
beepsrc = g_file_new_for_path (HEXCHATSHAREDIR G_DIR_SEPARATOR_S "sounds" G_DIR_SEPARATOR_S "freedesktop" G_DIR_SEPARATOR_S "stereo" G_DIR_SEPARATOR_S "hexchat_beep.wav");
#endif
beepdest = g_file_new_for_path (buf);
g_file_copy (beepsrc, beepdest, G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, NULL);
g_object_unref (beepsrc);
g_object_unref (beepdest);
}
g_mkdir (buf, 0700);
g_free (buf);
}
if (prefs.hex_gui_win_height < 138)

2
src/common/ctcp.c
View File

@@ -175,7 +175,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
#else
if (strchr (word[5], '/') == NULL)
#endif
sound_play (word[5], TRUE, FALSE);
sound_play (word[5], TRUE);
return;
}
}

2
src/common/outbound.c
View File

@@ -3161,7 +3161,7 @@ cmd_splay (struct session *sess, char *tbuf, char *word[], char *word_eol[])
{
if (*word[2])
{
sound_play (word[2], FALSE, FALSE);
sound_play (word[2], FALSE);
return TRUE;
}

12
src/common/text.c
View File

@@ -2221,7 +2221,7 @@ sound_find_command (void)
}
void
sound_play (const char *file, gboolean quiet, gboolean hexchat_beep)
sound_play (const char *file, gboolean quiet)
{
char *buf;
char *wavfile;
@@ -2234,10 +2234,10 @@ sound_play (const char *file, gboolean quiet, gboolean hexchat_beep)
}
#ifdef WIN32
/* check for fullpath; also use full path if hexchat_beep is TRUE, which should *only* happen when invoked by fe_beep() */
if (hexchat_beep || file[0] == '\\' || (((file[0] >= 'A' && file[0] <= 'Z') || (file[0] >= 'a' && file[0] <= 'z')) && file[1] == ':'))
/* check for fullpath */
if (file[0] == '\\' || (((file[0] >= 'A' && file[0] <= 'Z') || (file[0] >= 'a' && file[0] <= 'z')) && file[1] == ':'))
#else
if (hexchat_beep || file[0] == '/')
if (file[0] == '/')
#endif
{
wavfile = g_strdup (file);
@@ -2280,7 +2280,9 @@ void
sound_play_event (int i)
{
if (sound_files[i])
sound_play (sound_files[i], FALSE, FALSE);
{
sound_play (sound_files[i], FALSE);
}
}
static void

2
src/common/text.h
View File

@@ -53,7 +53,7 @@ int get_stamp_str (char *fmt, time_t tim, char **ret);
void format_event (session *sess, int index, char **args, char *o, int sizeofo, unsigned int stripcolor_args);
char *text_find_format_string (char *name);
void sound_play (const char *file, gboolean quiet, gboolean hexchat_beep);
void sound_play (const char *file, gboolean quiet);
void sound_play_event (int i);
void sound_beep (session *);
void sound_load ();