[asterisk-scf-commits] asterisk-scf/integration/media_format_ulaw.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  c59da29b96735b297d21b2bc775d7519a0c06b37 (commit)
      from  eeea588242efe93c964f71e0033c6956e6d2925c (commit)

Summary of changes:
 slice                        |    2 +-
 src/MediaFormatULAW.cpp      |   10 +++++-----
 test/TestMediaFormatULAW.cpp |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit c59da29b96735b297d21b2bc775d7519a0c06b37
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Sep 9 10:53:52 2010 -0300

    Update to latest slice.

diff --git a/slice b/slice
index 079ecce..14413db 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 079ecce809a4748542aaea1dda341c5d78f649d9
+Subproject commit 14413db47bfae3d1ff57d36e80cfe700d755ae0b
diff --git a/src/MediaFormatULAW.cpp b/src/MediaFormatULAW.cpp
index aa3f3ce..2016d45 100644
--- a/src/MediaFormatULAW.cpp
+++ b/src/MediaFormatULAW.cpp
@@ -13,9 +13,9 @@
 #include "System/Component/ComponentServiceIf.h"
 
 using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::System::Component::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::System::Component::V1;
 
 /**
  * Implementation of the MediaFormatService interface as defined in media.ice
@@ -27,7 +27,7 @@ public:
 	 * An implementation of the getFormat method as defined in media.ice which provides
 	 * ulaw media format concrete classes.
 	 */
-	FormatPtr getFormat(const Hydra::Media::V1::FormatDiscoveryPtr&, const Ice::Current&)
+	FormatPtr getFormat(const AsteriskSCF::Media::V1::FormatDiscoveryPtr&, const Ice::Current&)
 	{
 		/* Since ulaw is rather simple we don't need to interpret the parameters passed in. */
 		AudioFormatPtr format = new AudioFormat();
@@ -53,7 +53,7 @@ public:
 	 * performs checks on various types of discovery classes to determine if our component
 	 * should be chosen.
 	 */
-	bool isSupported(const Hydra::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const Ice::Current&)
+	bool isSupported(const AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr& params, const Ice::Current&)
 	{
 		FormatDiscoveryNamePtr discoveryname;
 		FormatDiscoverySDPPtr discoverysdp;
diff --git a/test/TestMediaFormatULAW.cpp b/test/TestMediaFormatULAW.cpp
index 37e7606..805b4c7 100644
--- a/test/TestMediaFormatULAW.cpp
+++ b/test/TestMediaFormatULAW.cpp
@@ -19,8 +19,8 @@
 #include "Media/MediaIf.h"
 
 using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
 
 /* Cache the command line arguments so that Ice can be initialized within the global fixture. */
 struct ArgCacheType

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_format_ulaw.git