Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 09:53:02 +01:00
Code Issues Projects Releases Wiki Activity

new default sounds; rm unused sounds

Browse Source
This commit is contained in:
Jfreegman 2014-10-01 00:53:45 -04:00
parent ae984d4f04
commit 5af561c811
18 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg/global_vars.mk
View File

@ -12,9 +12,9 @@ MISC_DIR = $(BASE_DIR)/misc
# Project files # Project files
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 = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
SNDFILES += LogIn.wav LogOut.wav NewMessage.wav OutgoingCall.wav SNDFILES += ToxicRecvMessage.wav OutgoingCall.wav IncomingCall.wav
SNDFILES += TransferComplete.wav TransferPending.wav SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
# Install directories # Install directories
PREFIX = /usr/local PREFIX = /usr/local

14
misc/toxic.conf.example
View File

@ -54,16 +54,14 @@ tox = {
// To disable a sound set the path to "silent" // To disable a sound set the path to "silent"
sounds = { sounds = {
error="__DATADIR__/sounds/Error.wav"; error="__DATADIR__/sounds/ToxicError.wav";
self_log_in="__DATADIR__/sounds/LogIn.wav"; user_log_in="__DATADIR__/sounds/ToxicContactOnline.wav";
self_log_out="__DATADIR__/sounds/LogOut.wav"; user_log_out="__DATADIR__/sounds/ToxicContactOffline.wav";
user_log_in="__DATADIR__/sounds/ContactLogsIn.wav";
user_log_out="__DATADIR__/sounds/ContactLogsOut.wav";
call_incoming="__DATADIR__/sounds/IncomingCall.wav"; call_incoming="__DATADIR__/sounds/IncomingCall.wav";
call_outgoing="__DATADIR__/sounds/OutgoingCall.wav"; call_outgoing="__DATADIR__/sounds/OutgoingCall.wav";
generic_message="__DATADIR__/sounds/NewMessage.wav"; generic_message="__DATADIR__/sounds/ToxicRecvMessage.wav";
transfer_pending="__DATADIR__/sounds/TransferPending.wav"; transfer_pending="__DATADIR__/sounds/ToxicTransferStart.wav";
transfer_completed="__DATADIR__/sounds/TransferComplete.wav"; transfer_completed="__DATADIR__/sounds/ToxicTransferComplete.wav";
}; };
// Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive) // Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)

BIN
sounds/ContactLogsIn.wav
View File

Binary file not shown.

BIN
sounds/ContactLogsOut.wav
View File

Binary file not shown.

BIN
sounds/Error.wav
View File

Binary file not shown.

BIN
sounds/LogIn.wav
View File

Binary file not shown.

BIN
sounds/LogOut.wav
View File

Binary file not shown.

BIN
sounds/NewMessage.wav
View File

Binary file not shown.

BIN
sounds/ToxicContactOffline.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicContactOnline.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicError.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicRecvMessage.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicTransferComplete.wav Normal file
View File

Binary file not shown.

BIN
sounds/ToxicTransferStart.wav Normal file
View File

Binary file not shown.

BIN
sounds/TransferComplete.wav
View File

Binary file not shown.

BIN
sounds/TransferPending.wav
View File

Binary file not shown.

4
sounds/license
View File

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

38
src/settings.c
View File

@ -324,33 +324,21 @@ int settings_load(struct user_settings *s, const char *patharg)
if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) || if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) ||
!set_sound(error, str) ) { !set_sound(error, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav"); set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) || if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) ||
!set_sound(user_log_in, str) ) { !set_sound(user_log_in, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav"); set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
}
if ( !config_setting_lookup_string(setting, sound_strings.self_log_in, &str) ||
!set_sound(self_log_in, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) || if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) ||
!set_sound(user_log_out, str) ) { !set_sound(user_log_out, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav"); set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.self_log_out, &str) ||
!set_sound(self_log_out, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
}
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)
@ -366,32 +354,30 @@ int settings_load(struct user_settings *s, const char *patharg)
if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) || if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
!set_sound(generic_message, str) ) { !set_sound(generic_message, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav"); set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) || if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) ||
!set_sound(transfer_pending, str) ) { !set_sound(transfer_pending, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav"); set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) || if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) ||
!set_sound(transfer_completed, str) ) { !set_sound(transfer_completed, str) ) {
if (str && strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav"); set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
} }
} }
else { else {
set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav"); set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav"); set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav"); set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav"); set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav"); set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav"); set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav"); set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav"); set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
} }
#endif #endif