From e89a8d9fa3365f46237d0718dd6b00c0ece3bb67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Jan 2015 19:49:28 +0000 Subject: Remove some libdcp vestiges. --- asdcplib/src/KM_util.cpp | 20 +------------------- asdcplib/src/KM_util.h | 5 ----- cscript | 3 --- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/asdcplib/src/KM_util.cpp b/asdcplib/src/KM_util.cpp index b181484..325bd2d 100755 --- a/asdcplib/src/KM_util.cpp +++ b/asdcplib/src/KM_util.cpp @@ -40,8 +40,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -bool Kumu::libdcp_test = false; - const char* Kumu::Version() { @@ -534,15 +532,6 @@ Kumu::GenRandomValue(UUID& ID) ID.Set(tmp_buf); } -#ifdef LIBDCP_POSIX -void -Kumu::ResetTestRNG() -{ - FortunaRNG RNG; - RNG.Reset(); -} -#endif - // void Kumu::GenRandomUUID(byte_t* buf) @@ -699,14 +688,7 @@ Kumu::write_BER(byte_t* buf, ui64_t val, ui32_t ber_len) // Kumu::Timestamp::Timestamp() : m_TZOffsetMinutes(0) { - if (libdcp_test) - { - m_Timestamp.x = 42; - } - else - { - m_Timestamp.now(); - } + m_Timestamp.now(); } Kumu::Timestamp::Timestamp(const Timestamp& rhs) { diff --git a/asdcplib/src/KM_util.h b/asdcplib/src/KM_util.h index a9793ba..78f0739 100755 --- a/asdcplib/src/KM_util.h +++ b/asdcplib/src/KM_util.h @@ -41,8 +41,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Kumu { - extern bool libdcp_test; - // The version number declaration and explanation are in ../configure.ac const char* Version(); @@ -381,9 +379,6 @@ namespace Kumu void GenRandomUUID(byte_t* buf); // buf must be UUID_Length or longer void GenRandomValue(UUID&); -#ifdef LIBDCP_POSIX - void ResetTestRNG(); -#endif typedef ArchivableList UUIDList; diff --git a/cscript b/cscript index 2bc82ea..0198fff 100644 --- a/cscript +++ b/cscript @@ -1,8 +1,5 @@ import os -def dependencies(target): - return (('libdcp', '5b519d9'),) - def build(target, options): cmd = './waf configure --prefix=%s' % target.directory if target.platform == 'linux': -- cgit v1.2.3