diff --git a/ringtones/Makefile.am b/ringtones/Makefile.am index 42b7ccf3b..a0718655e 100644 --- a/ringtones/Makefile.am +++ b/ringtones/Makefile.am @@ -1,5 +1,4 @@ ringringtonesdir = $(datadir)/ring/ringtones dist_ringringtones_DATA = \ konga.ul\ - phone.au\ - phone2.au + default.wav diff --git a/ringtones/default.wav b/ringtones/default.wav new file mode 100644 index 000000000..bc905cc0e Binary files /dev/null and b/ringtones/default.wav differ diff --git a/ringtones/phone.au b/ringtones/phone.au deleted file mode 100644 index 22be69bf2..000000000 Binary files a/ringtones/phone.au and /dev/null differ diff --git a/ringtones/phone2.au b/ringtones/phone2.au deleted file mode 100644 index 42cb62bb8..000000000 Binary files a/ringtones/phone2.au and /dev/null differ diff --git a/src/account.cpp b/src/account.cpp index 9f83f3284..d8690da53 100644 --- a/src/account.cpp +++ b/src/account.cpp @@ -113,9 +113,9 @@ Account::Account(const std::string &accountID) // Initialize the codec order, used when creating a new account loadDefaultCodecs(); #ifdef __ANDROID__ - ringtonePath_ = "/data/data/cx.ring/files/ringtones/konga.ul"; + ringtonePath_ = "/data/data/cx.ring/files/ringtones/default.wav"; #else - ringtonePath_ = "/usr/share/ring/ringtones/konga.ul"; + ringtonePath_ = "/usr/share/ring/ringtones/default.wav"; #endif } diff --git a/test/dring-sample.yml b/test/dring-sample.yml index fe76421c9..67832297b 100644 --- a/test/dring-sample.yml +++ b/test/dring-sample.yml @@ -21,7 +21,7 @@ accounts: publishPort: 5060 registrationexpire: 600 ringtoneEnabled: true - ringtonePath: /usr/share/ring/ringtones/konga.ul + ringtonePath: /usr/share/ring/ringtones/default.wav sameasLocal: true serviceRoute: srtp: @@ -93,7 +93,7 @@ accounts: publishPort: 5060 registrationexpire: 60 ringtoneEnabled: true - ringtonePath: /usr/share/ring/ringtones/konga.ul + ringtonePath: /usr/share/ring/ringtones/default.wav sameasLocal: true serviceRoute: srtp: diff --git a/tools/dringctrl/dring.functest.yml b/tools/dringctrl/dring.functest.yml index 926a0506b..77d643bad 100644 --- a/tools/dringctrl/dring.functest.yml +++ b/tools/dringctrl/dring.functest.yml @@ -18,7 +18,7 @@ accounts: publishPort: 5060 registrationexpire: 600 ringtoneEnabled: true - ringtonePath: /home/alexandresavard/Development/sflphone/gnome + ringtonePath: /usr/share/ring/ringtones/default.wav sameasLocal: true serviceRoute: srtp: @@ -67,7 +67,7 @@ accounts: publishPort: 5060 registrationexpire: 600 ringtoneEnabled: true - ringtonePath: /home/alexandresavard/Development/sflphone/gnome + ringtonePath: /usr/share/ring/ringtones/default.wav sameasLocal: true serviceRoute: srtp: @@ -116,7 +116,7 @@ accounts: publishPort: 5060 registrationexpire: 600 ringtoneEnabled: true - ringtonePath: /usr/share/sflphone/ringtones/konga.ul + ringtonePath: /usr/share/ring/ringtones/default.wav sameasLocal: true serviceRoute: srtp: