Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-common/libs/utilspp/NonCopyable.hpp

@@ -28,13 +28,15 @@ namespace utilspp
 {
    class NonCopyable
    {
-      public:
+      protected:
          NonCopyable()
          {}
+         ~NonCopyable()
+         {}
 
       private:
-         NonCopyable(const NonCopyable&)
-         {}
+         NonCopyable(const NonCopyable&);
+         const NonCopyable& operator=(const NonCopyable&);
    };
 }
 

sflphone-common/src/sip/sipcall.cpp

@@ -33,6 +33,7 @@
 
 #include "sipcall.h"
 #include "global.h" // for _debug
+#include "audio/audiortp/AudioRtpFactory.h"
 #include "sdp.h"
 
 const int SIPCall::CALL_MEMPOOL_INIT_SIZE = 16384;

sflphone-common/src/sip/sipcall.h

@@ -37,11 +37,7 @@
 #include <pjsip-simple/evsub.h>
 #include <pjsip_ua.h>
 
-#include "audio/audiortp/AudioRtpFactory.h"
-
-class AudioCodec;
 class Sdp;
-class AudioRtp;
 
 namespace sfl
 {

sflphone-common/src/sip/sipvoiplink.cpp

@@ -49,6 +49,7 @@
 #include "im/InstantMessaging.h"
 
 #include "audio/audiolayer.h"
+#include "audio/audiortp/AudioRtpFactory.h"
 
 #include "pjsip/sip_endpoint.h"
 #include "pjsip/sip_transport_tls.h"