[svn-commits] oej: branch oej/pinequeue-1.8 r363095 - in /team/oej/pinequeue-1.8: apps/ inc...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Apr 23 06:40:33 2012
New Revision: 363095

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363095
Log:
Trying another way

Modified:
    team/oej/pinequeue-1.8/apps/app_queue.c
    team/oej/pinequeue-1.8/include/asterisk/file.h
    team/oej/pinequeue-1.8/main/asterisk.dynamics
    team/oej/pinequeue-1.8/main/file.c
    team/oej/pinequeue-1.8/main/say.c

Modified: team/oej/pinequeue-1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-1.8/apps/app_queue.c?view=diff&rev=363095&r1=363094&r2=363095
==============================================================================
--- team/oej/pinequeue-1.8/apps/app_queue.c (original)
+++ team/oej/pinequeue-1.8/apps/app_queue.c Mon Apr 23 06:40:33 2012
@@ -5980,7 +5980,7 @@
 	}
 
 	/* look up the datastore and the play_finished struct, and set appropriate values */
-	if ((datastore = ast_channel_datastore_find(chan, queue_ds_sound_ending(), NULL))) {
+	if ((datastore = ast_channel_datastore_find(chan, ast_sound_ending(), NULL))) {
 		aqsi = datastore->data;
 		if (aqsi) {  /* copy this stuff into place */
 			aqsi->ringing = ringing;
@@ -5989,7 +5989,7 @@
 			}
 		}
 	} else {
-		ast_log(LOG_ERROR, "Can't find the queue_ds_sound_ending datastore! on chan %s\n", chan->name);
+		ast_log(LOG_ERROR, "Can't find the ast_sound_ending datastore! on chan %s\n", chan->name);
 		return 1; /* Why continue, if I can't access the datastore & list? */
 	}
 	ast_debug(2, "---- Aqsi now playing: %d\n", aqsi->now_playing);
@@ -6254,7 +6254,7 @@
 		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""),
 		qe.opos);
   /* Begin old Olle patch */
-	datastore = ast_datastore_alloc(queue_ds_sound_ending(), NULL);
+	datastore = ast_datastore_alloc(ast_sound_ending(), NULL);
 
 	aqsi->qe = &qe;
 	aqsi->chan = chan;

Modified: team/oej/pinequeue-1.8/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-1.8/include/asterisk/file.h?view=diff&rev=363095&r1=363094&r2=363095
==============================================================================
--- team/oej/pinequeue-1.8/include/asterisk/file.h (original)
+++ team/oej/pinequeue-1.8/include/asterisk/file.h Mon Apr 23 06:40:33 2012
@@ -40,7 +40,7 @@
 struct ast_filestream;
 struct ast_format;
 
-const struct ast_datastore_info *queue_ds_sound_ending(void);
+const struct ast_datastore_info *ast_sound_ending(void);
 
 /*! The maximum number of formats we expect to see in a format string */
 #define AST_MAX_FORMATS 10

Modified: team/oej/pinequeue-1.8/main/asterisk.dynamics
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-1.8/main/asterisk.dynamics?view=diff&rev=363095&r1=363094&r2=363095
==============================================================================
--- team/oej/pinequeue-1.8/main/asterisk.dynamics (original)
+++ team/oej/pinequeue-1.8/main/asterisk.dynamics Mon Apr 23 06:40:33 2012
@@ -1,4 +1,5 @@
 {
+	*ast_sound_*;
 	*ast_adsi_*;
 	*ast_agi_*;
 	*ast_pktccops_*;

Modified: team/oej/pinequeue-1.8/main/file.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-1.8/main/file.c?view=diff&rev=363095&r1=363094&r2=363095
==============================================================================
--- team/oej/pinequeue-1.8/main/file.c (original)
+++ team/oej/pinequeue-1.8/main/file.c Mon Apr 23 06:40:33 2012
@@ -709,15 +709,15 @@
 	return NULL;
 }
 
-const struct ast_datastore_info queue_ds_sound_ending_obj = { /* this is here because it is referenced here
+static const struct ast_datastore_info ast_sound_ending_obj = { /* this is here because it is referenced here
 							     and the only other place it is used is in app_queue,
 							     which is not always loaded. */
-        .type = "queue_sound_ending"
+        .type = "ast_sound_ending"
 };
 
-const struct ast_datastore_info *queue_ds_sound_ending()
-{
-	return &queue_ds_sound_ending_obj;
+const struct ast_datastore_info *ast_sound_ending()
+{
+	return &ast_sound_ending_obj;
 }
 
 

Modified: team/oej/pinequeue-1.8/main/say.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinequeue-1.8/main/say.c?view=diff&rev=363095&r1=363094&r2=363095
==============================================================================
--- team/oej/pinequeue-1.8/main/say.c (original)
+++ team/oej/pinequeue-1.8/main/say.c Mon Apr 23 06:40:33 2012
@@ -414,7 +414,7 @@
 	/* if a datastore is present, we are in the queue app (perhaps others in time)
 	   and don't want to wait around for the sounds to finish playing */
 
-	if ((datastore = ast_channel_datastore_find(chan, queue_ds_sound_ending(), NULL))) { /* app_queue wants to schedule this instead of play & wait */
+	if ((datastore = ast_channel_datastore_find(chan, ast_sound_ending(), NULL))) { /* app_queue wants to schedule this instead of play & wait */
 		struct ast_queue_streamfile_info *aqsi = datastore->data;
 		if (aqsi) {
 			AST_LIST_LOCK(&aqsi->flist);