- removed old smart pointer implementation. Switch to C++ 11 std::shared_ptr instead

src/engine/media/CMakeLists.txt

@@ -6,5 +6,29 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 file(GLOB MEDIA_LIB_SOURCES "*.cpp" "*.h")
 
+# SRTP requires this
+add_definitions(-DHAVE_STDINT_H -DHAVE_UINT64_T -DHAVE_NETINET_IN_H)
+
+if(CMAKE_SYSTEM MATCHES "Linux*")
+    add_definitions(-DHAVE_NETINET_IN_H)
+endif(CMAKE_SYSTEM MATCHES "Linux*")
+
+if(CMAKE_SYSTEM MATCHES "Darwin*")
+    # OS X Specific flags
+    add_definitions(-DHAVE_NETINET_IN_H)
+endif(CMAKE_SYSTEM MATCHES "Darwin*")
+
+if (CMAKE_SYSTEM MATCHES "Win*")
+    # Windows Specific flags - MSVC expected
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS -DHAVE_WINSOCK2_H
+        -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -DUNICODE -D_UNICODE )
+endif(CMAKE_SYSTEM MATCHES "Win*")
+
 add_library(media_lib ${MEDIA_LIB_SOURCES})
-target_include_directories(media_lib PRIVATE ../../libs/ ../ ../../libs/srtp/include ../../libs/srtp/crypto/include)
+
+target_include_directories(media_lib PRIVATE ../../libs/
+    ../ ../../libs/srtp/include
+    ../../libs/srtp/crypto/include
+    ../../libs/webrtc)
+
+

src/engine/media/MT_SingleAudioStream.cpp

@@ -1,11 +1,11 @@
-/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2018 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MT_SingleAudioStream.h"
 #include "MT_CodecList.h"
-#include "resip/stack/SdpContents.hxx"
+//#include "resip/stack/SdpContents.hxx"
 #include "../engine/helper/HL_Log.h"
 
 #define LOG_SUBSYSTEM "SingleAudioStream"
@@ -24,7 +24,7 @@ SingleAudioStream::~SingleAudioStream()
 void SingleAudioStream::process(std::shared_ptr<jrtplib::RTPPacket> packet)
 {
   ICELogMedia(<< "Processing incoming RTP/RTCP packet");
-  if (packet->GetPayloadType() == resip::Codec::TelephoneEvent.payloadType())
+  if (packet->GetPayloadType() == 101/*resip::Codec::TelephoneEvent.payloadType()*/)
     mDtmfReceiver.add(packet);
   else
     mReceiver.add(packet);