[asterisk-commits] rmudgett: branch rmudgett/fix_history r395429 - in /team/rmudgett/fix_history...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jul 25 13:16:51 CDT 2013
Author: rmudgett
Date: Thu Jul 25 13:16:48 2013
New Revision: 395429
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395429
Log:
Readd changes to files.
Added:
team/rmudgett/fix_history/include/asterisk/bridge.h
- copied, changed from r395428, team/rmudgett/fix_history/include/asterisk/bridging.h
team/rmudgett/fix_history/include/asterisk/bridge_after.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_after.h
team/rmudgett/fix_history/include/asterisk/bridge_basic.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_basic.h
team/rmudgett/fix_history/include/asterisk/bridge_channel.h
- copied, changed from r395428, team/rmudgett/fix_history/include/asterisk/bridging_channel.h
team/rmudgett/fix_history/include/asterisk/bridge_channel_internal.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_channel_internal.h
team/rmudgett/fix_history/include/asterisk/bridge_features.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_features.h
team/rmudgett/fix_history/include/asterisk/bridge_internal.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_internal.h
team/rmudgett/fix_history/include/asterisk/bridge_roles.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_roles.h
team/rmudgett/fix_history/include/asterisk/bridge_technology.h
- copied unchanged from r395428, team/rmudgett/fix_history/include/asterisk/bridging_technology.h
team/rmudgett/fix_history/include/asterisk/stasis_bridges.h
- copied, changed from r395428, team/rmudgett/fix_history/include/asterisk/stasis_bridging.h
team/rmudgett/fix_history/main/bridge.c
- copied, changed from r395428, team/rmudgett/fix_history/main/bridging.c
team/rmudgett/fix_history/main/bridge_after.c
- copied, changed from r395428, team/rmudgett/fix_history/main/bridging_after.c
team/rmudgett/fix_history/main/bridge_basic.c
- copied, changed from r395428, team/rmudgett/fix_history/main/bridging_basic.c
team/rmudgett/fix_history/main/bridge_channel.c
- copied, changed from r395428, team/rmudgett/fix_history/main/bridging_channel.c
team/rmudgett/fix_history/main/bridge_roles.c
- copied, changed from r395428, team/rmudgett/fix_history/main/bridging_roles.c
team/rmudgett/fix_history/main/manager_bridges.c
- copied, changed from r395428, team/rmudgett/fix_history/main/manager_bridging.c
team/rmudgett/fix_history/main/stasis_bridges.c
- copied, changed from r395428, team/rmudgett/fix_history/main/stasis_bridging.c
Removed:
team/rmudgett/fix_history/include/asterisk/bridging.h
team/rmudgett/fix_history/include/asterisk/bridging_after.h
team/rmudgett/fix_history/include/asterisk/bridging_basic.h
team/rmudgett/fix_history/include/asterisk/bridging_channel.h
team/rmudgett/fix_history/include/asterisk/bridging_channel_internal.h
team/rmudgett/fix_history/include/asterisk/bridging_features.h
team/rmudgett/fix_history/include/asterisk/bridging_internal.h
team/rmudgett/fix_history/include/asterisk/bridging_roles.h
team/rmudgett/fix_history/include/asterisk/bridging_technology.h
team/rmudgett/fix_history/include/asterisk/stasis_bridging.h
team/rmudgett/fix_history/main/bridging.c
team/rmudgett/fix_history/main/bridging_after.c
team/rmudgett/fix_history/main/bridging_basic.c
team/rmudgett/fix_history/main/bridging_channel.c
team/rmudgett/fix_history/main/bridging_roles.c
team/rmudgett/fix_history/main/manager_bridging.c
team/rmudgett/fix_history/main/stasis_bridging.c
Copied: team/rmudgett/fix_history/include/asterisk/bridge.h (from r395428, team/rmudgett/fix_history/include/asterisk/bridging.h)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/include/asterisk/bridge.h?view=diff&rev=395429&p1=team/rmudgett/fix_history/include/asterisk/bridging.h&r1=395428&p2=team/rmudgett/fix_history/include/asterisk/bridge.h&r2=395429
==============================================================================
--- team/rmudgett/fix_history/include/asterisk/bridging.h (original)
+++ team/rmudgett/fix_history/include/asterisk/bridge.h Thu Jul 25 13:16:48 2013
@@ -69,9 +69,9 @@
extern "C" {
#endif
-#include "asterisk/bridging_features.h"
-#include "asterisk/bridging_channel.h"
-#include "asterisk/bridging_roles.h"
+#include "asterisk/bridge_features.h"
+#include "asterisk/bridge_channel.h"
+#include "asterisk/bridge_roles.h"
#include "asterisk/dsp.h"
#include "asterisk/uuid.h"
Copied: team/rmudgett/fix_history/include/asterisk/bridge_channel.h (from r395428, team/rmudgett/fix_history/include/asterisk/bridging_channel.h)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/include/asterisk/bridge_channel.h?view=diff&rev=395429&p1=team/rmudgett/fix_history/include/asterisk/bridging_channel.h&r1=395428&p2=team/rmudgett/fix_history/include/asterisk/bridge_channel.h&r2=395429
==============================================================================
--- team/rmudgett/fix_history/include/asterisk/bridging_channel.h (original)
+++ team/rmudgett/fix_history/include/asterisk/bridge_channel.h Thu Jul 25 13:16:48 2013
@@ -53,7 +53,7 @@
extern "C" {
#endif
-#include "asterisk/bridging_technology.h"
+#include "asterisk/bridge_technology.h"
/*! \brief State information about a bridged channel */
enum bridge_channel_state {
Copied: team/rmudgett/fix_history/include/asterisk/stasis_bridges.h (from r395428, team/rmudgett/fix_history/include/asterisk/stasis_bridging.h)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/include/asterisk/stasis_bridges.h?view=diff&rev=395429&p1=team/rmudgett/fix_history/include/asterisk/stasis_bridging.h&r1=395428&p2=team/rmudgett/fix_history/include/asterisk/stasis_bridges.h&r2=395429
==============================================================================
--- team/rmudgett/fix_history/include/asterisk/stasis_bridging.h (original)
+++ team/rmudgett/fix_history/include/asterisk/stasis_bridges.h Thu Jul 25 13:16:48 2013
@@ -28,7 +28,7 @@
#include "asterisk/lock.h"
#include "asterisk/linkedlists.h"
#include "asterisk/channel.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
#include "asterisk/pbx.h"
/*!
Copied: team/rmudgett/fix_history/main/bridge.c (from r395428, team/rmudgett/fix_history/main/bridging.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/bridge.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/bridging.c&r1=395428&p2=team/rmudgett/fix_history/main/bridge.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/bridging.c (original)
+++ team/rmudgett/fix_history/main/bridge.c Thu Jul 25 13:16:48 2013
@@ -37,14 +37,14 @@
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/linkedlists.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_internal.h"
-#include "asterisk/bridging_channel_internal.h"
-#include "asterisk/bridging_basic.h"
-#include "asterisk/bridging_technology.h"
-#include "asterisk/bridging_channel.h"
-#include "asterisk/bridging_after.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_internal.h"
+#include "asterisk/bridge_channel_internal.h"
+#include "asterisk/bridge_basic.h"
+#include "asterisk/bridge_technology.h"
+#include "asterisk/bridge_channel.h"
+#include "asterisk/bridge_after.h"
+#include "asterisk/stasis_bridges.h"
#include "asterisk/stasis_channels.h"
#include "asterisk/app.h"
#include "asterisk/file.h"
Copied: team/rmudgett/fix_history/main/bridge_after.c (from r395428, team/rmudgett/fix_history/main/bridging_after.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/bridge_after.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/bridging_after.c&r1=395428&p2=team/rmudgett/fix_history/main/bridge_after.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/bridging_after.c (original)
+++ team/rmudgett/fix_history/main/bridge_after.c Thu Jul 25 13:16:48 2013
@@ -37,7 +37,7 @@
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
-#include "asterisk/bridging_after.h"
+#include "asterisk/bridge_after.h"
struct after_bridge_cb_node {
/*! Next list node. */
Copied: team/rmudgett/fix_history/main/bridge_basic.c (from r395428, team/rmudgett/fix_history/main/bridging_basic.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/bridge_basic.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/bridging_basic.c&r1=395428&p2=team/rmudgett/fix_history/main/bridge_basic.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/bridging_basic.c (original)
+++ team/rmudgett/fix_history/main/bridge_basic.c Thu Jul 25 13:16:48 2013
@@ -34,17 +34,17 @@
#include "asterisk/channel.h"
#include "asterisk/utils.h"
#include "asterisk/linkedlists.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_basic.h"
-#include "asterisk/bridging_after.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_internal.h"
+#include "asterisk/bridge_basic.h"
+#include "asterisk/bridge_after.h"
#include "asterisk/astobj2.h"
#include "asterisk/features_config.h"
#include "asterisk/pbx.h"
#include "asterisk/file.h"
#include "asterisk/app.h"
-#include "asterisk/bridging_internal.h"
#include "asterisk/dial.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
#define NORMAL_FLAGS (AST_BRIDGE_FLAG_DISSOLVE_HANGUP | AST_BRIDGE_FLAG_DISSOLVE_EMPTY \
| AST_BRIDGE_FLAG_SMART)
Copied: team/rmudgett/fix_history/main/bridge_channel.c (from r395428, team/rmudgett/fix_history/main/bridging_channel.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/bridge_channel.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/bridging_channel.c&r1=395428&p2=team/rmudgett/fix_history/main/bridge_channel.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/bridging_channel.c (original)
+++ team/rmudgett/fix_history/main/bridge_channel.c Thu Jul 25 13:16:48 2013
@@ -43,12 +43,12 @@
#include "asterisk/pbx.h"
#include "asterisk/channel.h"
#include "asterisk/timing.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_channel.h"
-#include "asterisk/bridging_after.h"
-#include "asterisk/bridging_channel_internal.h"
-#include "asterisk/bridging_internal.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_channel.h"
+#include "asterisk/bridge_after.h"
+#include "asterisk/bridge_channel_internal.h"
+#include "asterisk/bridge_internal.h"
+#include "asterisk/stasis_bridges.h"
#include "asterisk/stasis_channels.h"
#include "asterisk/musiconhold.h"
#include "asterisk/features_config.h"
Copied: team/rmudgett/fix_history/main/bridge_roles.c (from r395428, team/rmudgett/fix_history/main/bridging_roles.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/bridge_roles.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/bridging_roles.c&r1=395428&p2=team/rmudgett/fix_history/main/bridge_roles.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/bridging_roles.c (original)
+++ team/rmudgett/fix_history/main/bridge_roles.c Thu Jul 25 13:16:48 2013
@@ -39,8 +39,8 @@
#include "asterisk/channel.h"
#include "asterisk/datastore.h"
#include "asterisk/linkedlists.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_roles.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_roles.h"
#include "asterisk/stringfields.h"
struct bridge_role_option {
Copied: team/rmudgett/fix_history/main/manager_bridges.c (from r395428, team/rmudgett/fix_history/main/manager_bridging.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/manager_bridges.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/manager_bridging.c&r1=395428&p2=team/rmudgett/fix_history/main/manager_bridges.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/manager_bridging.c (original)
+++ team/rmudgett/fix_history/main/manager_bridges.c Thu Jul 25 13:16:48 2013
@@ -27,7 +27,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
#include "asterisk/stasis_channels.h"
#include "asterisk/manager.h"
#include "asterisk/stasis_message_router.h"
Copied: team/rmudgett/fix_history/main/stasis_bridges.c (from r395428, team/rmudgett/fix_history/main/stasis_bridging.c)
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/fix_history/main/stasis_bridges.c?view=diff&rev=395429&p1=team/rmudgett/fix_history/main/stasis_bridging.c&r1=395428&p2=team/rmudgett/fix_history/main/stasis_bridges.c&r2=395429
==============================================================================
--- team/rmudgett/fix_history/main/stasis_bridging.c (original)
+++ team/rmudgett/fix_history/main/stasis_bridges.c Thu Jul 25 13:16:48 2013
@@ -34,10 +34,10 @@
#include "asterisk/astobj2.h"
#include "asterisk/stasis.h"
#include "asterisk/channel.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
#include "asterisk/stasis_channels.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_technology.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_technology.h"
#define SNAPSHOT_CHANNELS_BUCKETS 13
More information about the asterisk-commits
mailing list