r3401 - in trunk: libmikey/include/libmikey libminisip/source/subsystem_config libminisip/source/subsystem_contacts libminisip/source/subsystem_media libminisip/source/subsystem_media/codecs libminisip/source/subsystem_media/soundcard libminisip/source/subsystem_media/soundcard/resampler libminisip/source/subsystem_media/video libminisip/source/subsystem_media/video/display libminisip/source/subsystem_media/video/grabber libmutil/include/libmutil milbc/source
erik at minisip.org
erik at minisip.org
Tue Aug 28 11:50:33 CEST 2007
Author: erik
Date: 2007-08-28 11:50:33 +0200 (Tue, 28 Aug 2007)
New Revision: 3401
Modified:
trunk/libmikey/include/libmikey/KeyAgreementDH.h
trunk/libminisip/source/subsystem_config/GConfBackend.cxx
trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx
trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx
trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx
trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
trunk/libminisip/source/subsystem_media/AudioPlugin.cxx
trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx
trunk/libminisip/source/subsystem_media/codecs/GsmCodec.cxx
trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx
trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/resampler/FloatResampler.cxx
trunk/libminisip/source/subsystem_media/video/VideoPlugin.cxx
trunk/libminisip/source/subsystem_media/video/display/SdlDisplay.cxx
trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx
trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx
trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.cxx
trunk/libmutil/include/libmutil/MPlugin.h
trunk/milbc/source/ILBCCODEC.cxx
Log:
* There is a problem with the plugin creator functions when declaring them
extern C LIMBX_API. They returned an MRef to a plugin. Example error:
error C2526: 'mg711_LTX_getPlugin' : C linkage function cannot return C++ class MRef<OPType>
I changed from "MRef<MObject*>" to "MObject*". If you don't
like this, please shout.
* Note that in AudioPlugin.cxx, I have changed from:
MRef<MPlugin *> *maudio_LTX_getPlugin( MRef<Library*> lib )
to
MPlugin * maudio_LTX_getPlugin( MRef<Library*> lib )
Note the extra "*" before the function name that other "getPlugin"
functions don't have. I don't see how it can be needed.
* Fixed a wrong ifdef (to discard MSVC * pragmas)
Modified: trunk/libmikey/include/libmikey/KeyAgreementDH.h
===================================================================
--- trunk/libmikey/include/libmikey/KeyAgreementDH.h 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libmikey/include/libmikey/KeyAgreementDH.h 2007-08-28 09:50:33 UTC (rev 3401)
@@ -56,7 +56,7 @@
We turn off the warning for this situation so that not every
compile that includes this file gets those warnings.
*/
-#ifndef _MSC_VER
+#ifdef _MSC_VER
#pragma warning (disable: 4250)
#endif
Modified: trunk/libminisip/source/subsystem_config/GConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/GConfBackend.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_config/GConfBackend.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -54,7 +54,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mgconf_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mgconf_LTX_getPlugin( MRef<Library*> lib ){
return new GConfigPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -49,7 +49,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mxmlconf_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mxmlconf_LTX_getPlugin( MRef<Library*> lib ){
return new MXmlConfigPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -57,7 +57,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> onlineconf_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * onlineconf_LTX_getPlugin( MRef<Library*> lib ){
return new OnlineMXmlConfigPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -51,7 +51,7 @@
}
extern "C"
-MRef<MPlugin *> ldappb_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * ldappb_LTX_getPlugin( MRef<Library *> lib ){
return new LdapPhoneBookIoDriver( lib );
}
Modified: trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -54,7 +54,7 @@
}
extern "C"
-MRef<MPlugin *> mxmlpb_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * mxmlpb_LTX_getPlugin( MRef<Library *> lib ){
return new MXmlPhoneBookIoDriver( lib );
}
#endif
Modified: trunk/libminisip/source/subsystem_media/AudioPlugin.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioPlugin.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/AudioPlugin.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -48,8 +48,8 @@
}
extern "C"
-MRef<MPlugin *> *maudio_LTX_getPlugin( MRef<Library*> lib ){
- return &plugin;
+MPlugin * maudio_LTX_getPlugin( MRef<Library*> lib ){
+ return /*&plugin*/ *plugin;
}
AudioPlugin::AudioPlugin( MRef<Library*> lib ): MediaPlugin( lib ){
Modified: trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/codecs/G711CODEC.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -49,12 +49,12 @@
}
extern "C"
-MRef<MPlugin *> mg711_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * mg711_LTX_getPlugin( MRef<Library *> lib ){
return new G711Codec( lib, G711U );
}
extern "C"
-MRef<MPlugin *> mg711_LTX_getPluginG711a( MRef<Library *> lib ){
+MPlugin * mg711_LTX_getPluginG711a( MRef<Library *> lib ){
return new G711Codec( lib, G711A );
}
Modified: trunk/libminisip/source/subsystem_media/codecs/GsmCodec.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/GsmCodec.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/codecs/GsmCodec.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -46,7 +46,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mgsm_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * mgsm_LTX_getPlugin( MRef<Library *> lib ){
return new GsmCodec( lib );
}
Modified: trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -46,7 +46,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mspeex_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * mspeex_LTX_getPlugin( MRef<Library *> lib ){
return new SpeexCodec( lib );
}
Modified: trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -48,7 +48,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> malsa_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * malsa_LTX_getPlugin( MRef<Library*> lib ){
return new AlsaSoundDriver( lib );
}
Modified: trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -48,7 +48,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mdsound_LTX_getDirectSoundPlugin( MRef<Library*> lib ){
+MPlugin * mdsound_LTX_getDirectSoundPlugin( MRef<Library*> lib ){
return new DirectSoundDriver( lib );
}
Modified: trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -49,7 +49,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mportaudio_LTX_getPortAudioPlugin( MRef<Library*> lib ){
+MPlugin * mportaudio_LTX_getPortAudioPlugin( MRef<Library*> lib ){
return new PortAudioDriver( lib );
}
Modified: trunk/libminisip/source/subsystem_media/soundcard/resampler/FloatResampler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/resampler/FloatResampler.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/soundcard/resampler/FloatResampler.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -46,7 +46,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mfloat_resampler_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mfloat_resampler_LTX_getPlugin( MRef<Library*> lib ){
return new FloatResamplerPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_media/video/VideoPlugin.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/VideoPlugin.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/video/VideoPlugin.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -60,7 +60,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mvideo_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mvideo_LTX_getPlugin( MRef<Library*> lib ){
return new VideoPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_media/video/display/SdlDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/SdlDisplay.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/video/display/SdlDisplay.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -51,7 +51,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> msdl_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * msdl_LTX_getPlugin( MRef<Library*> lib ){
return new SdlPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -46,7 +46,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mx11_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mx11_LTX_getPlugin( MRef<Library*> lib ){
return new X11Plugin( lib );
}
Modified: trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -45,7 +45,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mxv_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mxv_LTX_getPlugin( MRef<Library*> lib ){
return new XvPlugin( lib );
}
Modified: trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -57,7 +57,7 @@
}
extern "C" LIBMINISIP_API
-MRef<MPlugin *> mdc1394_LTX_getPlugin( MRef<Library*> lib ){
+MPlugin * mdc1394_LTX_getPlugin( MRef<Library*> lib ){
return new Dc1394Plugin( lib );
}
Modified: trunk/libmutil/include/libmutil/MPlugin.h
===================================================================
--- trunk/libmutil/include/libmutil/MPlugin.h 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/libmutil/include/libmutil/MPlugin.h 2007-08-28 09:50:33 UTC (rev 3401)
@@ -74,7 +74,7 @@
* \brief MPlugin object factory, entry point in the
* shared library.
**/
- typedef MRef<MPlugin *> (* creator)(MRef<Library*> lib);
+ typedef MPlugin * (* creator)(MRef<Library*> lib);
/**
* @returns the MemObject type.
Modified: trunk/milbc/source/ILBCCODEC.cxx
===================================================================
--- trunk/milbc/source/ILBCCODEC.cxx 2007-08-27 11:26:05 UTC (rev 3400)
+++ trunk/milbc/source/ILBCCODEC.cxx 2007-08-28 09:50:33 UTC (rev 3401)
@@ -43,7 +43,7 @@
}
extern "C" MILBC_API
-MRef<MPlugin *> milbc_LTX_getPlugin( MRef<Library *> lib ){
+MPlugin * milbc_LTX_getPlugin( MRef<Library *> lib ){
return new ILBCCodec( lib );
}
More information about the Minisip-devel
mailing list