Tha_14
/
toxic
mirror of https://github.com/Tha14/toxic.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

replace call sounds 

Signed-off-by: Jfreegman <jfreegman@gmail.com>
This commit is contained in:
Jfreegman 2014-10-01 19:38:09 -04:00
parent e7697b8fba
commit fa64fa8b93
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/global_vars.mk
View File

@ -13,7 +13,7 @@ MISC_DIR = $(BASE_DIR)/misc
MANFILES = toxic.1 toxic.conf.5 MANFILES = toxic.1 toxic.conf.5
DATAFILES = DHTnodes DNSservers toxic.conf.example DATAFILES = DHTnodes DNSservers toxic.conf.example
SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
SNDFILES += ToxicRecvMessage.wav OutgoingCall.wav IncomingCall.wav SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
# Install directories # Install directories

BIN
sounds/IncomingCall.wav
View File

Binary file not shown.

BIN
sounds/OutgoingCall.wav
View File

Binary file not shown.

BIN
sounds/ToxicIncomingCall.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicOutgoingCall.wav Normal file
View File

Binary file not shown.

5
sounds/license
View File

@ -1,3 +1,2 @@
ToxicContactOffline.wav, ToxicRecvMessage.wav, ToxicContactOnline.wav, ToxicTransferComplete.wav, ToxicError.wav and ToxicTransferStart.wav are licensed under the same license as Toxic. ToxicError.wav, ToxicRecvMessage.wav, ToxicContactOffline.wav, ToxicIncomingCall.wav, ToxicTransferComplete.wav, ToxicContactOnline.wav, ToxicOutgoingCall.wav and ToxicTransferStart.wav
are licensed under the "Creative Commons Attribution 3.0 Unported". All credit attributed to Jfreegman.
IncomingCall.wav and OutgoingCall.wav are licensed under the "Creative Commons Attribution 3.0 Unported", all credit attributed to Adam Reid.

8
src/settings.c
View File

@ -342,13 +342,13 @@ int settings_load(struct user_settings *s, const char *patharg)
if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) || if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) ||
!set_sound(call_incoming, str) ) { !set_sound(call_incoming, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav"); set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) || if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) ||
!set_sound(call_outgoing, str) ) { !set_sound(call_outgoing, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav"); set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) || if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
@ -373,8 +373,8 @@ int settings_load(struct user_settings *s, const char *patharg)
set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav"); set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav"); set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav"); set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav"); set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav"); set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav"); set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav"); set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav"); set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");