kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_confbridge: Whitespace

Browse Source 
Because there is sometimes no sence to any whitespace.
........

Merged revisions 431049 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 431050 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-01-23 19:51:42 +00:00
parent 89610adda5
commit b38be992b1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_confbridge.c
View File

@@ -557,31 +557,33 @@ static void send_unmute_event(struct confbridge_user *user, struct confbridge_co
static void set_rec_filename(struct confbridge_conference *conference, struct ast_str **filename, int is_new)
{
char *rec_file = conference->b_profile.rec_file;
time_t now;
char *ext;
time_t now;
if (ast_str_strlen(*filename) && ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) && !is_new) {
return;
if (ast_str_strlen(*filename)
&& ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND)
&& !is_new) {
return;
}
time(&now);
ast_str_reset(*filename);
if (ast_strlen_zero(rec_file)) {
ast_str_set(filename, 0, "confbridge-%s-%u.wav", conference->name, (unsigned int)now);
ast_str_set(filename, 0, "confbridge-%s-%u.wav", conference->name,
(unsigned int) now);
} else if (ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_TIMESTAMP)) {
/* insert time before file extension */
ext = strrchr(rec_file, '.');
if (ext) {
ast_str_set_substr(filename, 0, rec_file, ext - rec_file);
ast_str_append(filename, 0, "-%u%s", (unsigned int)now, ext);
ast_str_append(filename, 0, "-%u%s", (unsigned int) now, ext);
} else {
ast_str_set(filename, 0, "%s-%u", rec_file, (unsigned int)now);
ast_str_set(filename, 0, "%s-%u", rec_file, (unsigned int) now);
}
} else {
ast_str_set(filename, 0, "%s", rec_file);
}
ast_str_append(filename, 0, ",%s%s,%s",
ast_test_flag(&conference->b_profile, BRIDGE_OPT_RECORD_FILE_APPEND) ? "a" : "",
conference->b_profile.rec_options,