r3507 - in trunk: libminisip/include/libminisip/ipprovider libminisip/include/libminisip/media libminisip/include/libminisip/signaling/sip libminisip/source/subsystem_media libmsip/source/transports
erik at minisip.org
erik at minisip.org
Thu Nov 22 15:29:26 CET 2007
Author: erik
Date: 2007-11-22 15:29:25 +0100 (Thu, 22 Nov 2007)
New Revision: 3507
Modified:
trunk/libminisip/include/libminisip/ipprovider/IpProvider.h
trunk/libminisip/include/libminisip/media/Media.h
trunk/libminisip/include/libminisip/media/SubsystemMedia.h
trunk/libminisip/include/libminisip/signaling/sip/Sip.h
trunk/libminisip/source/subsystem_media/AudioMedia.cxx
trunk/libminisip/source/subsystem_media/Media.cxx
trunk/libminisip/source/subsystem_media/MediaHandler.cxx
trunk/libmsip/source/transports/SipTransport.cxx
Log:
Compile fixes for MSVC
* Removed Media::set/getMediaHandler. It is not needed.
* Added includes where needed
* Added include needed to use "transform".
There is a problem with MediaStreamSender not being defined for
users of Media.h that still needs to be fixed (it's not a trivial fix since
MediaStream is not part of the API, and can not be included from Media.h).
Modified: trunk/libminisip/include/libminisip/ipprovider/IpProvider.h
===================================================================
--- trunk/libminisip/include/libminisip/ipprovider/IpProvider.h 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/include/libminisip/ipprovider/IpProvider.h 2007-11-22 14:29:25 UTC (rev 3507)
@@ -42,4 +42,7 @@
static MRef<IpProvider *> create( MRef<SipSoftPhoneConfiguration *> config, bool useIpv6 = false );
};
+
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
+
#endif
Modified: trunk/libminisip/include/libminisip/media/Media.h
===================================================================
--- trunk/libminisip/include/libminisip/media/Media.h 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/include/libminisip/media/Media.h 2007-11-22 14:29:25 UTC (rev 3507)
@@ -39,7 +39,6 @@
class SoundIO;
class MediaStreamSender;
-class MediaStreamReceiver;
class SdpHeaderM;
class SipSoftPhoneConfiguration;
class SubsystemMedia;
@@ -181,10 +180,6 @@
*/
MRef<CodecState *> createCodecInstance( uint8_t payloadType );
- void setMediaHandler(MRef<MediaHandler*> reg);
-
- MRef<MediaHandler*> getMediaHandler();
-
protected:
Media();
Media( MRef<Codec *> defaultCodec );
@@ -199,7 +194,6 @@
Mutex sourcesLock;
std::list<std::string> sdpAttributes;
- MRef<MediaHandler*> mediaHandler;
};
Modified: trunk/libminisip/include/libminisip/media/SubsystemMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/SubsystemMedia.h 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/include/libminisip/media/SubsystemMedia.h 2007-11-22 14:29:25 UTC (rev 3507)
@@ -27,9 +27,9 @@
#include<libminisip/libminisip_config.h>
#include<libmutil/MessageRouter.h>
+#include<libminisip/ipprovider/IpProvider.h>
class SipSoftPhoneConfiguration;
-class IpProvider;
class Session;
class SipIdentity;
Modified: trunk/libminisip/include/libminisip/signaling/sip/Sip.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/Sip.h 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/include/libminisip/signaling/sip/Sip.h 2007-11-22 14:29:25 UTC (rev 3507)
@@ -39,6 +39,7 @@
#include<libminisip/media/SubsystemMedia.h>
class SipSoftPhoneConfiguration;
+class SubsystemMedia;
class LIBMINISIP_API Sip: public Runnable{
Modified: trunk/libminisip/source/subsystem_media/AudioMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-11-22 14:29:25 UTC (rev 3507)
@@ -244,7 +244,7 @@
for( iSource = sources.begin(); iSource != sources.end(); iSource ++ ){
if ( (*iSource)->getCallId()!= (*i)->getCallId() ){
short *stream = (*iSource)->getCodecOutputBuffer();
- for (int ii=0; ii< length/2; ii++)
+ for (uint32_t ii=0; ii< length/2; ii++)
((short*)data)[ii] += stream[ii];
Modified: trunk/libminisip/source/subsystem_media/Media.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/Media.cxx 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/source/subsystem_media/Media.cxx 2007-11-22 14:29:25 UTC (rev 3507)
@@ -34,7 +34,7 @@
#include<libmutil/stringutils.h>
#include<libminisip/signaling/sdp/SdpHeaderM.h>
#include<libminisip/signaling/sdp/SdpHeaderA.h>
-#include"MediaHandler.h"
+//#include"MediaHandler.h"
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
@@ -64,16 +64,6 @@
}
-void Media::setMediaHandler(MRef<MediaHandler*> reg){
- mediaHandler=reg;
-}
-
-MRef<MediaHandler*> Media::getMediaHandler(){
- return mediaHandler;
-}
-
-
-
// pn507 Added for being able to change the current codec
// pn507 NOTE Using this during a conference call will most likely cause complete havoc.
MRef<Codec *> Media::getCodec( uint8_t payloadType ){
@@ -109,14 +99,6 @@
sendersLock.unlock();
}
-#if 0
-void Media::registerMediaSource( uint32_t ssrc ){
-}
-
-void Media::unRegisterMediaSource( uint32_t ssrc ){
-}
-#endif
-
void Media::sendData( byte_t * data, uint32_t length, uint32_t ts, bool marker ){
list< MRef<MediaStreamSender *> >::iterator i;
sendersLock.lock();
Modified: trunk/libminisip/source/subsystem_media/MediaHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-11-22 14:29:25 UTC (rev 3507)
@@ -81,8 +81,6 @@
MRef<Media *> m = mediaPlugin->createMedia( config );
MRef<AudioMedia *> audio = dynamic_cast<AudioMedia *>( *m );
- m->setMediaHandler(this);
-
if( m ){
registerMedia( m );
}
Modified: trunk/libmsip/source/transports/SipTransport.cxx
===================================================================
--- trunk/libmsip/source/transports/SipTransport.cxx 2007-11-21 19:50:32 UTC (rev 3506)
+++ trunk/libmsip/source/transports/SipTransport.cxx 2007-11-22 14:29:25 UTC (rev 3507)
@@ -28,6 +28,8 @@
#include"SipTransportTls.h"
#include"SipTransportDtlsUdp.h"
+#include<algorithm>
+
using namespace std;
SipTransport::SipTransport(): MPlugin(){
More information about the Minisip-devel
mailing list