[asterisk-scf-commits] asterisk-scf/release/mediaformatgeneric.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b61ce3985ccedf90ba7d244f503f586d51dc33e1 (commit)
       via  34850d5d4c6af304af9822bff730ac12d83d436a (commit)
       via  151e606d447e25ef531c2b6aca271e60323c9746 (commit)
       via  2774dadcf3722dfe8af461b90e1d3444bff23ce8 (commit)
      from  2693fde6377f6e4f2ace06f7c9712d7e966390f4 (commit)

Summary of changes:
 src/CMakeLists.txt                                 |    6 +++---
 src/Component.cpp                                  |    8 ++++----
 ...tGenericConfiguration.cpp => Configuration.cpp} |    2 +-
 ...ormatGenericConfiguration.h => Configuration.h} |    0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{MediaFormatGenericConfiguration.cpp => Configuration.cpp} (99%)
 rename src/{MediaFormatGenericConfiguration.h => Configuration.h} (100%)


- Log -----------------------------------------------------------------
commit b61ce3985ccedf90ba7d244f503f586d51dc33e1
Merge: 34850d5 2693fde
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 30 14:54:02 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/mediaformatgeneric


commit 34850d5d4c6af304af9822bff730ac12d83d436a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Dec 28 12:17:21 2011 -0600

    Adjust for name changes in ice-util-cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f1c03ac..2a0a433 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,12 +4,12 @@ include_directories(${astscf-ice-util-cpp_dir}/include)
 astscf_component_init(mediaformatgeneric)
 astscf_component_add_files(mediaformatgeneric Component.cpp)
 astscf_component_add_files(mediaformatgeneric MediaFormatGeneric.h)
-astscf_component_add_files(mediaformatgeneric GenericConfiguration.cpp)
-astscf_component_add_files(mediaformatgeneric GenericConfiguration.h)
+astscf_component_add_files(mediaformatgeneric Configuration.cpp)
+astscf_component_add_files(mediaformatgeneric Configuration.h)
 astscf_component_add_slices(mediaformatgeneric PROJECT AsteriskSCF/Configuration/MediaFormatGeneric/MediaFormatGenericConfigurationIf.ice)
 astscf_component_add_boost_libraries(mediaformatgeneric core thread)
 astscf_component_add_slice_collection_libraries(mediaformatgeneric ASTSCF)
 astscf_component_build_icebox(mediaformatgeneric)
-target_link_libraries(mediaformatgeneric astscf-ice-util-cpp LoggingClient)
+target_link_libraries(mediaformatgeneric ASTSCFIceUtilCpp LoggingClient)
 astscf_component_install(mediaformatgeneric)
 

commit 151e606d447e25ef531c2b6aca271e60323c9746
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 27 16:33:11 2011 -0600

    Adjust for change for T.38 header name change.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92892f0..f1c03ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,6 +10,6 @@ astscf_component_add_slices(mediaformatgeneric PROJECT AsteriskSCF/Configuration
 astscf_component_add_boost_libraries(mediaformatgeneric core thread)
 astscf_component_add_slice_collection_libraries(mediaformatgeneric ASTSCF)
 astscf_component_build_icebox(mediaformatgeneric)
-target_link_libraries(mediaformatgeneric astscf-ice-util-cpp logging-client)
+target_link_libraries(mediaformatgeneric astscf-ice-util-cpp LoggingClient)
 astscf_component_install(mediaformatgeneric)
 
diff --git a/src/Component.cpp b/src/Component.cpp
index 15820e9..a685379 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -23,8 +23,8 @@
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Media/MediaIf.h>
 #include <AsteriskSCF/Media/SDP/MediaSDPIf.h>
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
-#include <AsteriskSCF/Media/Formats/T38UdptlFormat.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
+#include <AsteriskSCF/Media/Formats/T38UDPTLFormatIf.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
 #include <AsteriskSCF/Logger.h>

commit 2774dadcf3722dfe8af461b90e1d3444bff23ce8
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Dec 1 10:55:02 2011 -0600

    Some initial file renaming work.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ff06ab..92892f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,8 @@ include_directories(${astscf-ice-util-cpp_dir}/include)
 astscf_component_init(mediaformatgeneric)
 astscf_component_add_files(mediaformatgeneric Component.cpp)
 astscf_component_add_files(mediaformatgeneric MediaFormatGeneric.h)
-astscf_component_add_files(mediaformatgeneric MediaFormatGenericConfiguration.cpp)
-astscf_component_add_files(mediaformatgeneric MediaFormatGenericConfiguration.h)
+astscf_component_add_files(mediaformatgeneric GenericConfiguration.cpp)
+astscf_component_add_files(mediaformatgeneric GenericConfiguration.h)
 astscf_component_add_slices(mediaformatgeneric PROJECT AsteriskSCF/Configuration/MediaFormatGeneric/MediaFormatGenericConfigurationIf.ice)
 astscf_component_add_boost_libraries(mediaformatgeneric core thread)
 astscf_component_add_slice_collection_libraries(mediaformatgeneric ASTSCF)
diff --git a/src/Component.cpp b/src/Component.cpp
index 09694c7..15820e9 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -27,12 +27,12 @@
 #include <AsteriskSCF/Media/Formats/T38UdptlFormat.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
 #include <AsteriskSCF/Component/Component.h>
 
 #include "MediaFormatGeneric.h"
-#include "MediaFormatGenericConfiguration.h"
+#include "Configuration.h"
 #include "MediaFormatGenericConfigurationIf.h"
 
 using namespace std;
diff --git a/src/MediaFormatGenericConfiguration.cpp b/src/Configuration.cpp
similarity index 99%
rename from src/MediaFormatGenericConfiguration.cpp
rename to src/Configuration.cpp
index a125576..2f29437 100644
--- a/src/MediaFormatGenericConfiguration.cpp
+++ b/src/Configuration.cpp
@@ -23,7 +23,7 @@
 #include <AsteriskSCF/System/Component/ConfigurationIf.h>
 
 #include "MediaFormatGenericConfigurationIf.h"
-#include "MediaFormatGenericConfiguration.h"
+#include "Configuration.h"
 #include "MediaFormatGeneric.h"
 
 using namespace AsteriskSCF::System::Configuration::V1;
diff --git a/src/MediaFormatGenericConfiguration.h b/src/Configuration.h
similarity index 100%
rename from src/MediaFormatGenericConfiguration.h
rename to src/Configuration.h

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


-- 
asterisk-scf/release/mediaformatgeneric.git