[svn-commits] oej: branch oej/pinequeue-trunk r363928 - in /team/oej/pinequeue-trunk: apps/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Apr 26 03:51:45 CDT 2012
Author: oej
Date: Thu Apr 26 03:51:40 2012
New Revision: 363928
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363928
Log:
Removing red dots
Modified:
team/oej/pinequeue-trunk/apps/app_queue.c
team/oej/pinequeue-trunk/main/asterisk.dynamics
team/oej/pinequeue-trunk/main/say.c
Modified: team/oej/pinequeue-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-trunk/apps/app_queue.c?view=diff&rev=363928&r1=363927&r2=363928
==============================================================================
--- team/oej/pinequeue-trunk/apps/app_queue.c (original)
+++ team/oej/pinequeue-trunk/apps/app_queue.c Thu Apr 26 03:51:40 2012
@@ -2877,7 +2877,7 @@
if ((avgholdmins+avgholdsecs) > 0 && qe->parent->announceholdtime &&
((qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE && !qe->last_pos) ||
!(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE))) {
- res = play_file(qe->chan, qe->parent->sound_holdtime,ringing,NULL);
+ res = play_file(qe->chan, qe->parent->sound_holdtime, ringing, NULL);
if (res) {
goto playout;
}
@@ -4927,7 +4927,7 @@
/* instead of starting autoservice and jacking this thread to push sound to the
peer channel, let's set up a background player to the peer channel and
get on with life in this thread. */
-
+
if (qe->parent->memberdelay) {
ast_log(LOG_NOTICE, "Delaying member connect for %d seconds\n", qe->parent->memberdelay);
res2 |= ast_safe_sleep(peer, qe->parent->memberdelay * 1000);
@@ -4945,8 +4945,6 @@
holdtime = abs((now - qe->start) / 60);
holdtimesecs = abs((now - qe->start) % 60);
if (holdtime > 0) {
- //int ast_say_number(struct ast_channel *chan, int num,
- //const char *ints, const char *lang, const char *options);
ast_say_number(peer, holdtime, AST_DIGIT_ANY, ast_channel_language(peer), NULL);
play_file(peer, qe->parent->sound_minutes, ringing, qe->moh);
}
@@ -6283,7 +6281,6 @@
struct gen_state *generatordata;
struct ast_queue_streamfile_name *sfn = NULL;
char playfilename[512];
-
if (!background_prompts) {
if (ast_strlen_zero(filename)) {
@@ -6319,7 +6316,7 @@
return 1; /* Why continue, if I can't access the datastore & list? */
}
ast_debug(2, "---- Background prompts now playing: %d\n", aqsi->now_playing);
-
+
if (aqsi->now_playing == 0) {
playfilename[0] = '\0';
if (ast_strlen_zero(filename)) {
@@ -6351,7 +6348,7 @@
}
AST_LIST_LOCK(&aqsi->flist);
-
+
if (aqsi->now_playing) {
struct ast_queue_streamfile_name *fn = ast_calloc(1, sizeof(*fn));
fn->filename = ast_strdup(filename);
@@ -6399,14 +6396,14 @@
}
aqsi->now_playing = 1; /* We have begun playback */
}
-
+
AST_LIST_UNLOCK(&aqsi->flist);
ast_waitfor(chan, 1);
-
+
return 0; /* non-zero most likely means the file doesn't exist */
}
-/*! \brief This routine propably will only need to be called at module unload time */
+/*! \brief Destroy playlist */
void destroy_streamfile_info(struct ast_queue_streamfile_info *playdata)
{
struct ast_queue_streamfile_name *fn;
@@ -6592,7 +6589,6 @@
strcpy(aqsi->moh, qe.moh);
AST_LIST_HEAD_INIT(&aqsi->flist);
datastore->data = aqsi;
-
ast_channel_datastore_add(chan, datastore);
}
@@ -6717,11 +6713,10 @@
if (background_prompts) {
/* remove the playdata datastore */
ast_channel_datastore_remove(chan, datastore);
-
- /* get rid of the datastore for non-wait sound playing */
+ /* get rid of the datastore for non-wait sound playing */
destroy_streamfile_info(aqsi);
}
-
+
if (res) {
if (res < 0) {
if (!qe.handled) {
Modified: team/oej/pinequeue-trunk/main/asterisk.dynamics
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-trunk/main/asterisk.dynamics?view=diff&rev=363928&r1=363927&r2=363928
==============================================================================
--- team/oej/pinequeue-trunk/main/asterisk.dynamics (original)
+++ team/oej/pinequeue-trunk/main/asterisk.dynamics Thu Apr 26 03:51:40 2012
@@ -1,5 +1,5 @@
{
- *ast_sound_*;
+ *ast_prompt_list;
*ast_adsi_*;
*ast_agi_*;
*ast_pktccops_*;
Modified: team/oej/pinequeue-trunk/main/say.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-trunk/main/say.c?view=diff&rev=363928&r1=363927&r2=363928
==============================================================================
--- team/oej/pinequeue-trunk/main/say.c (original)
+++ team/oej/pinequeue-trunk/main/say.c Thu Apr 26 03:51:40 2012
@@ -423,10 +423,10 @@
AST_LIST_LOCK(&aqsi->flist);
if (aqsi->now_playing) {
struct ast_queue_streamfile_name *fn = ast_calloc(1, sizeof(*fn));
-
+
fn->filename = ast_strdup(file);
ast_debug(3, "----> Adding file %s to playlist for %s\n", file, ast_channel_name(chan));
-
+
/* link the struct into the current ast_queue_streamfile_info struct */
AST_LIST_INSERT_TAIL(&aqsi->flist, fn, list);
} else {
@@ -436,22 +436,17 @@
} else {
ast_moh_stop(aqsi->chan);
}
-
+
ast_stopstream(aqsi->chan);
-
ast_autoservice_stop(aqsi->chan);
-
res = ast_streamfile(aqsi->chan, file, ast_channel_language(aqsi->chan)); /* begin the streaming */
while (res && !AST_LIST_EMPTY(&aqsi->flist)) {
struct ast_queue_streamfile_name *fn;
-
fn = AST_LIST_REMOVE_HEAD(&aqsi->flist, list);
-
ast_debug(3,"Start streaming file %s\n", fn->filename);
res = ast_streamfile(aqsi->chan, fn->filename, ast_channel_language(aqsi->chan));
}
-
-
+
if (res) {
/* oops, the current file has problems */
/* restore the moh */
@@ -470,7 +465,6 @@
return 0;
}
return 0;
-
}
/* otherwise, exactly business as usual */
if ((res = ast_streamfile(chan, file, lang))) {
@@ -3231,10 +3225,6 @@
}
if (!res)
res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL);
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res)
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
return res;
@@ -3254,10 +3244,6 @@
}
if (!res)
res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, (char * ) NULL);
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res) {
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = wait_file(chan, ints, fn, lang);
@@ -3301,10 +3287,6 @@
}
if (!res)
res = ast_say_enumeration(chan, tm.tm_mday, ints, lang, (char * ) NULL);
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res) {
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = wait_file(chan, ints, fn, lang);
@@ -3381,10 +3363,6 @@
}
if (!res)
res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL);
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res) {
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = wait_file(chan, ints, fn, lang);
@@ -3412,10 +3390,6 @@
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = wait_file(chan, ints, fn, lang);
}
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res)
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
return res;
@@ -3437,10 +3411,6 @@
}
if (!res)
res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL);
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res) {
ast_copy_string(fn, "digits/duan", sizeof(fn));
res = wait_file(chan, ints, fn, lang);
@@ -3501,11 +3471,6 @@
if (!res) {
res = ast_say_number(chan, tm.tm_mday, ints, lang, "m");
}
-#ifdef IS_THIS_A_MISTAKE
- if (!res) {
- res = ast_waitstream(chan, ints);
- }
-#endif
if (!res) {
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, "m");
}
@@ -6444,22 +6409,10 @@
if (!res) { /* say a leading zero if needed */
res = ast_say_number_full_he(chan, 0, ints, lang, "f", -1, -1);
}
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
if (!res)
res = ast_say_number_full_he(chan, tm.tm_min, ints, lang, "f", -1, -1);
} else {
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
- }
-#ifdef IS_THIS_A_MISTAKE
- if (!res)
- res = ast_waitstream(chan, ints);
-#endif
+ }
return res;
}
@@ -6856,26 +6809,10 @@
/* say a leading zero if needed */
res = ast_say_number(chan, 0, ints, lang, "f");
}
-#ifdef IS_THIS_A_MISTAKE
- if (!res) {
- res = ast_waitstream(chan, ints);
- }
-#endif
if (!res) {
res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
}
- } else {
-#ifdef IS_THIS_A_MISTAKE
- if (!res) {
- res = ast_waitstream(chan, ints);
- }
-#endif
- }
-#ifdef IS_THIS_A_MISTAKE
- if (!res) {
- res = ast_waitstream(chan, ints);
- }
-#endif
+ }
if (!res) {
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, "f");
}
More information about the svn-commits
mailing list