summaryrefslogtreecommitdiff
path: root/src/Dict.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2006-04-05 23:03:55 +0000
committerjhurst <>2006-04-05 23:03:55 +0000
commitbfedf725dac9d13f3a02fe69f45c302ab29d2b1e (patch)
tree4a746f759dcb62ebeb6309373e7579d6048f4af6 /src/Dict.cpp
parentfdf31e0105bf8272a6b7fa9c4039941dff37a271 (diff)
ginormo merge-back with Kumu, SMPTE MIC key and MPEG parser fix
Diffstat (limited to 'src/Dict.cpp')
-rwxr-xr-xsrc/Dict.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Dict.cpp b/src/Dict.cpp
index fa51fbd..e2aadcb 100755
--- a/src/Dict.cpp
+++ b/src/Dict.cpp
@@ -30,12 +30,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "Mutex.h"
+#include "KM_mutex.h"
#include "KLV.h"
#include "MDD.cpp"
#include <map>
-static ASDCP::Mutex s_Lock;
+static Kumu::Mutex s_Lock;
static bool s_md_init = false;
static std::map<ASDCP::UL, ui32_t> s_md_lookup;
@@ -56,7 +56,8 @@ ASDCP::Dict::FindUL(const byte_t* ul_buf)
{
if ( ! s_md_init )
{
- AutoMutex AL(s_Lock);
+ Kumu::AutoMutex AL(s_Lock);
+
if ( ! s_md_init )
{
for ( ui32_t x = 0; x < s_MDD_Table_size; x++ )