r3244 - in trunk: libminisip/include libminisip/include/libminisip
libminisip/include/libminisip/config
libminisip/include/libminisip/contacts
libminisip/include/libminisip/gui
libminisip/include/libminisip/media
libminisip/include/libminisip/media/rtp
libminisip/include/libminisip/media/soundcard
libminisip/include/libminisip/media/video
libminisip/include/libminisip/media/video/codec
libminisip/include/libminisip/media/video/display
libminisip/include/libminisip/media/video/grabber
libminisip/include/libminisip/media/video/mixer
libminisip/include/libminisip/signaling
libminisip/include/libminisip/signaling/conference
libminisip/include/libminisip/signaling/p2t
libminisip/include/libminisip/signaling/sdp
libminisip/include/libminisip/signaling/sip
libminisip/include/libminisip/signaling/zrtp
libminisip/source libminisip/source/aec
libminisip/source/conference libminisip/source/ipprovider
libminisip/source/subsystem_config
libminisip/source/subsystem_contacts libminisip/source/subsystem_gui
libminisip/source/subsystem_media
libminisip/source/subsystem_media/aec
libminisip/source/subsystem_media/codecs
libminisip/source/subsystem_media/codecs/g711
libminisip/source/subsystem_media/rtp
libminisip/source/subsystem_media/soundcard
libminisip/source/subsystem_media/soundcard/resampler
libminisip/source/subsystem_media/spaudio
libminisip/source/subsystem_media/video
libminisip/source/subsystem_media/video/codec
libminisip/source/subsystem_media/video/display
libminisip/source/subsystem_media/video/examples
libminisip/source/subsystem_media/video/grabber
libminisip/source/subsystem_media/video/mixer
libminisip/source/subsystem_signaling/p2t
libminisip/source/subsystem_signaling/sdp
libminisip/source/subsystem_signaling/sip
libminisip/source/subsystem_signaling/zrtp libminisip/tests
minisip/minisip/gui/gtkgui minisip/minisip/gui/textui
erik at minisip.org
erik at minisip.org
Tue Mar 13 00:08:05 CET 2007
Author: erik
Date: 2007-03-13 00:08:04 +0100 (Tue, 13 Mar 2007)
New Revision: 3244
Added:
trunk/libminisip/include/libminisip/signaling/conference/
Removed:
trunk/libminisip/include/libminisip/conference/
Modified:
trunk/libminisip/include/Makefile.am
trunk/libminisip/include/libminisip/config/OnlineConfBackend.h
trunk/libminisip/include/libminisip/contacts/MXmlPhoneBookIo.h
trunk/libminisip/include/libminisip/contacts/OnlineMXmlPhoneBookIo.h
trunk/libminisip/include/libminisip/contacts/PhoneBook.h
trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h
trunk/libminisip/include/libminisip/gui/Gui.h
trunk/libminisip/include/libminisip/media/AudioMedia.h
trunk/libminisip/include/libminisip/media/CallRecorder.h
trunk/libminisip/include/libminisip/media/Media.h
trunk/libminisip/include/libminisip/media/MediaHandler.h
trunk/libminisip/include/libminisip/media/MediaStream.h
trunk/libminisip/include/libminisip/media/Session.h
trunk/libminisip/include/libminisip/media/SessionRegistry.h
trunk/libminisip/include/libminisip/media/rtp/CryptoContext.h
trunk/libminisip/include/libminisip/media/rtp/RtcpPacket.h
trunk/libminisip/include/libminisip/media/rtp/RtcpReportRR.h
trunk/libminisip/include/libminisip/media/rtp/RtcpReportSDES.h
trunk/libminisip/include/libminisip/media/rtp/RtcpReportSR.h
trunk/libminisip/include/libminisip/media/rtp/RtcpReportXR.h
trunk/libminisip/include/libminisip/media/rtp/RtpPacket.h
trunk/libminisip/include/libminisip/media/rtp/SDESChunk.h
trunk/libminisip/include/libminisip/media/rtp/SDES_CNAME.h
trunk/libminisip/include/libminisip/media/rtp/SDES_EMAIL.h
trunk/libminisip/include/libminisip/media/rtp/SDES_LOC.h
trunk/libminisip/include/libminisip/media/rtp/SDES_NAME.h
trunk/libminisip/include/libminisip/media/rtp/SDES_NOTE.h
trunk/libminisip/include/libminisip/media/rtp/SDES_PHONE.h
trunk/libminisip/include/libminisip/media/rtp/SDES_TOOL.h
trunk/libminisip/include/libminisip/media/rtp/SRtpPacket.h
trunk/libminisip/include/libminisip/media/rtp/XRVoIPReportBlock.h
trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSimple.h
trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSpatial.h
trunk/libminisip/include/libminisip/media/soundcard/FileSoundSource.h
trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h
trunk/libminisip/include/libminisip/media/soundcard/SoundDriver.h
trunk/libminisip/include/libminisip/media/soundcard/SoundDriverRegistry.h
trunk/libminisip/include/libminisip/media/soundcard/SoundIO.h
trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h
trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h
trunk/libminisip/include/libminisip/media/video/VideoMedia.h
trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h
trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h
trunk/libminisip/include/libminisip/media/video/codec/VideoCodec.h
trunk/libminisip/include/libminisip/media/video/display/VideoDisplay.h
trunk/libminisip/include/libminisip/media/video/grabber/Grabber.h
trunk/libminisip/include/libminisip/media/video/mixer/ImageMixer.h
trunk/libminisip/include/libminisip/signaling/conference/ConfCallback.h
trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h
trunk/libminisip/include/libminisip/signaling/conference/ConferenceControl.h
trunk/libminisip/include/libminisip/signaling/p2t/GroupList.h
trunk/libminisip/include/libminisip/signaling/p2t/GroupListClient.h
trunk/libminisip/include/libminisip/signaling/p2t/GroupListServer.h
trunk/libminisip/include/libminisip/signaling/p2t/GroupListUserElement.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpAPP.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpReceiver.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpSender.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGetFloor.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGrantFloor.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionIdleFloor.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionReleaseFloor.h
trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionTakenFloor.h
trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2T.h
trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2Tuser.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderA.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderC.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderM.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderO.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderS.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderT.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderV.h
trunk/libminisip/include/libminisip/signaling/sdp/SdpPacket.h
trunk/libminisip/include/libminisip/signaling/sip/DefaultDialogHandler.h
trunk/libminisip/include/libminisip/signaling/sip/Sip.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceClient.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceServer.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoip.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipClient.h
trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipServer.h
trunk/libminisip/include/libminisip/signaling/sip/SipSoftPhoneConfiguration.h
trunk/libminisip/include/libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h
trunk/libminisip/source/Minisip.cxx
trunk/libminisip/source/aec/aec.cxx
trunk/libminisip/source/conference/ConfMessageRouter.cxx
trunk/libminisip/source/conference/ConferenceControl.cxx
trunk/libminisip/source/ipprovider/IpProvider.cxx
trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx
trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
trunk/libminisip/source/ipprovider/StunIpProvider.cxx
trunk/libminisip/source/subsystem_config/ConfBackend.cxx
trunk/libminisip/source/subsystem_config/GConfBackend.h
trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx
trunk/libminisip/source/subsystem_config/MXmlConfBackend.h
trunk/libminisip/source/subsystem_config/OnlineConfBackend.cxx
trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx
trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.h
trunk/libminisip/source/subsystem_config/UserConfigPosix.cxx
trunk/libminisip/source/subsystem_config/UserConfigWin32.cxx
trunk/libminisip/source/subsystem_contacts/ContactDb.cxx
trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
trunk/libminisip/source/subsystem_contacts/OnlineMXmlPhoneBookIo.cxx
trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx
trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx
trunk/libminisip/source/subsystem_gui/Gui.cxx
trunk/libminisip/source/subsystem_media/AudioMedia.cxx
trunk/libminisip/source/subsystem_media/AudioPlugin.cxx
trunk/libminisip/source/subsystem_media/AudioPlugin.h
trunk/libminisip/source/subsystem_media/CallRecorder.cxx
trunk/libminisip/source/subsystem_media/DtmfSender.cxx
trunk/libminisip/source/subsystem_media/Media.cxx
trunk/libminisip/source/subsystem_media/MediaCommandString.cxx
trunk/libminisip/source/subsystem_media/MediaHandler.cxx
trunk/libminisip/source/subsystem_media/MediaStream.cxx
trunk/libminisip/source/subsystem_media/RtpReceiver.cxx
trunk/libminisip/source/subsystem_media/Session.cxx
trunk/libminisip/source/subsystem_media/SessionRegistry.cxx
trunk/libminisip/source/subsystem_media/aec/aec.cxx
trunk/libminisip/source/subsystem_media/codecs/Codec.cxx
trunk/libminisip/source/subsystem_media/codecs/G711CODEC.h
trunk/libminisip/source/subsystem_media/codecs/GsmCodec.h
trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.h
trunk/libminisip/source/subsystem_media/codecs/g711/codec_g711.cxx
trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpDebugMonitor.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpPacket.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportSDES.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportSenderInfo.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportXR.cxx
trunk/libminisip/source/subsystem_media/rtp/RtpHeader.cxx
trunk/libminisip/source/subsystem_media/rtp/RtpPacket.cxx
trunk/libminisip/source/subsystem_media/rtp/SDESChunk.cxx
trunk/libminisip/source/subsystem_media/rtp/SDESItem.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_CNAME.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_EMAIL.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_LOC.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_NAME.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_NOTE.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_PHONE.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_TOOL.cxx
trunk/libminisip/source/subsystem_media/rtp/SRtpPacket.cxx
trunk/libminisip/source/subsystem_media/rtp/XRReportBlock.cxx
trunk/libminisip/source/subsystem_media/rtp/XRVoIPReportBlock.cxx
trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDevice.h
trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/AlsaSoundDriver.h
trunk/libminisip/source/subsystem_media/soundcard/AudioMixer.cxx
trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSimple.cxx
trunk/libminisip/source/subsystem_media/soundcard/AudioMixerSpatial.cxx
trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDevice.h
trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/DirectSoundDriver.h
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDevice.h
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/FileSoundDriver.h
trunk/libminisip/source/subsystem_media/soundcard/FileSoundSource.cxx
trunk/libminisip/source/subsystem_media/soundcard/OssSoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/PortAudioDevice.h
trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/PortAudioDriver.h
trunk/libminisip/source/subsystem_media/soundcard/SilenceSensor.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDriver.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDriverRegistry.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundIO.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundSource.cxx
trunk/libminisip/source/subsystem_media/soundcard/resampler/FloatResampler.h
trunk/libminisip/source/subsystem_media/soundcard/resampler/Resampler.cxx
trunk/libminisip/source/subsystem_media/soundcard/resampler/SimpleResampler.h
trunk/libminisip/source/subsystem_media/spaudio/SpAudio.cxx
trunk/libminisip/source/subsystem_media/video/VideoMedia.cxx
trunk/libminisip/source/subsystem_media/video/VideoPlugin.cxx
trunk/libminisip/source/subsystem_media/video/codec/AVCoder.cxx
trunk/libminisip/source/subsystem_media/video/codec/AVDecoder.cxx
trunk/libminisip/source/subsystem_media/video/codec/VideoCodec.cxx
trunk/libminisip/source/subsystem_media/video/display/SdlDisplay.h
trunk/libminisip/source/subsystem_media/video/display/VideoDisplay.cxx
trunk/libminisip/source/subsystem_media/video/display/X11Display.cxx
trunk/libminisip/source/subsystem_media/video/display/X11Display.h
trunk/libminisip/source/subsystem_media/video/display/XvDisplay.cxx
trunk/libminisip/source/subsystem_media/video/display/XvDisplay.h
trunk/libminisip/source/subsystem_media/video/examples/view.cxx
trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.cxx
trunk/libminisip/source/subsystem_media/video/grabber/Dc1394Grabber.h
trunk/libminisip/source/subsystem_media/video/grabber/Grabber.cxx
trunk/libminisip/source/subsystem_media/video/grabber/V4LGrabber.cxx
trunk/libminisip/source/subsystem_media/video/grabber/V4LGrabber.h
trunk/libminisip/source/subsystem_media/video/mixer/ImageMixer.cxx
trunk/libminisip/source/subsystem_signaling/p2t/GroupList.cxx
trunk/libminisip/source/subsystem_signaling/p2t/GroupListClient.cxx
trunk/libminisip/source/subsystem_signaling/p2t/GroupListServer.cxx
trunk/libminisip/source/subsystem_signaling/p2t/GroupListUserElement.cxx
trunk/libminisip/source/subsystem_signaling/p2t/P2T.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpAPP.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpAPPHeader.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpReceiver.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpSender.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpTransactionGetFloor.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpTransactionGrantFloor.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpTransactionIdleFloor.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpTransactionReleaseFloor.cxx
trunk/libminisip/source/subsystem_signaling/p2t/RtcpTransactionTakenFloor.cxx
trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2T.cxx
trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2Tuser.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeader.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderA.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderO.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderS.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderT.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderV.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpPacket.cxx
trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
trunk/libminisip/source/subsystem_signaling/sip/PresenceMessageContent.cxx
trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipSoftPhoneConfiguration.cxx
trunk/libminisip/source/subsystem_signaling/zrtp/ZrtpHostBridgeMinisip.cxx
trunk/libminisip/tests/000_compile.cxx
trunk/minisip/minisip/gui/gtkgui/AccountsList.cxx
trunk/minisip/minisip/gui/gtkgui/CallWidget.cxx
trunk/minisip/minisip/gui/gtkgui/ConferenceWidget.cxx
trunk/minisip/minisip/gui/gtkgui/ConferenceWidget.h
trunk/minisip/minisip/gui/gtkgui/ContactDialog.cxx
trunk/minisip/minisip/gui/gtkgui/GtkMain.cxx
trunk/minisip/minisip/gui/gtkgui/GtkMainUI.cxx
trunk/minisip/minisip/gui/gtkgui/LogWidget.cxx
trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
trunk/minisip/minisip/gui/gtkgui/PhoneBook.cxx
trunk/minisip/minisip/gui/gtkgui/SettingsDialog.cxx
trunk/minisip/minisip/gui/textui/MinisipTextUI.cxx
trunk/minisip/minisip/gui/textui/MinisipTextUI.h
Log:
* updated Makefile.am with new header locations
* Updated users of the header files.
(automated, for example: sed -i "s/libminisip\/sip\//libminisip\/signaling\/sip\//"
`find . -name "*.h"` `find . -name *.cxx`)
Modified: trunk/libminisip/include/Makefile.am
===================================================================
--- trunk/libminisip/include/Makefile.am 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/Makefile.am 2007-03-12 23:08:04 UTC (rev 3244)
@@ -1,123 +1,123 @@
-nobase_include_HEADERS = libminisip/aec/aecfix.h \
- libminisip/aec/aec.h \
- libminisip/codecs/Codec.h \
+nobase_include_HEADERS = libminisip/media/aec/aecfix.h \
+ libminisip/media/aec/aec.h \
+ libminisip/media/codecs/Codec.h \
libminisip/gui/LogEntry.h \
libminisip/gui/Gui.h \
libminisip/gui/Bell.h \
libminisip/gui/ConsoleDebugger.h \
- libminisip/mediahandler/MediaCommandString.h \
- libminisip/mediahandler/RtpReceiver.h \
- libminisip/mediahandler/DtmfSender.h \
- libminisip/mediahandler/MediaStream.h \
- libminisip/mediahandler/AudioMedia.h \
- libminisip/mediahandler/SessionRegistry.h \
- libminisip/mediahandler/MediaHandler.h \
- libminisip/mediahandler/Media.h \
- libminisip/mediahandler/Session.h \
- libminisip/mediahandler/CallRecorder.h \
- libminisip/p2t/SipDialogP2Tuser.h \
- libminisip/p2t/SipDialogP2T.h \
- libminisip/p2t/RtcpTransactionGrantFloor.h \
- libminisip/p2t/GroupListUserElement.h \
- libminisip/p2t/RtcpAPPHeader.h \
- libminisip/p2t/RtcpAPP.h \
- libminisip/p2t/GroupListClient.h \
- libminisip/p2t/RtcpSender.h \
- libminisip/p2t/P2T.h \
- libminisip/p2t/RtcpTransactionIdleFloor.h \
- libminisip/p2t/RtcpTransactionReleaseFloor.h \
- libminisip/p2t/RtcpTransactionGetFloor.h \
- libminisip/p2t/GroupListServer.h \
- libminisip/p2t/RtcpReceiver.h \
- libminisip/p2t/RtcpTransactionTakenFloor.h \
- libminisip/p2t/GroupList.h \
- libminisip/rtp/RtcpReportSenderInfo.h \
- libminisip/rtp/XRVoIPReportBlock.h \
- libminisip/rtp/SDES_LOC.h \
- libminisip/rtp/SDES_NAME.h \
- libminisip/rtp/RtcpDebugMonitor.h \
- libminisip/rtp/XRReportBlock.h \
- libminisip/rtp/SDES_CNAME.h \
- libminisip/rtp/RtcpReport.h \
- libminisip/rtp/RtcpReportSR.h \
- libminisip/rtp/SDESItem.h \
- libminisip/rtp/RtpHeader.h \
- libminisip/rtp/SRtpPacket.h \
- libminisip/rtp/SDESChunk.h \
- libminisip/rtp/SDES_TOOL.h \
- libminisip/rtp/RtpPacket.h \
- libminisip/rtp/RtcpPacket.h \
- libminisip/rtp/SDES_EMAIL.h \
- libminisip/rtp/RtcpReportRR.h \
- libminisip/rtp/RtcpReportXR.h \
- libminisip/rtp/SDES_NOTE.h \
- libminisip/rtp/RtcpReportSDES.h \
- libminisip/rtp/CryptoContext.h \
- libminisip/rtp/SDES_PHONE.h \
- libminisip/rtp/RtcpReportReceptionBlock.h \
- libminisip/sdp/SdpHeader.h \
- libminisip/sdp/SdpHeaderA.h \
- libminisip/sdp/SdpHeaderC.h \
- libminisip/sdp/SdpHeaderM.h \
- libminisip/sdp/SdpHeaderO.h \
- libminisip/sdp/SdpPacket.h \
- libminisip/sdp/SdpHeaderS.h \
- libminisip/sdp/SdpHeaderT.h \
- libminisip/sdp/SdpHeaderV.h \
- libminisip/sip/SipDialogConfVoip.h \
- libminisip/sip/SipDialogVoip.h \
- libminisip/sip/Sip.h \
- libminisip/sip/SipDialogPresenceClient.h \
- libminisip/sip/SipDialogVoipServer.h \
- libminisip/sip/DefaultDialogHandler.h \
- libminisip/sip/PresenceMessageContent.h \
- libminisip/sip/SipDialogVoipClient.h \
- libminisip/sip/SipSoftPhoneConfiguration.h \
- libminisip/sip/SipDialogPresenceServer.h \
- libminisip/soundcard/Resampler.h \
- libminisip/soundcard/SoundRecorderCallback.h \
- libminisip/soundcard/WaveSoundDevice.h \
- libminisip/soundcard/SoundIOPLCInterface.h \
- libminisip/soundcard/AudioMixer.h \
- libminisip/soundcard/SoundSource.h \
- libminisip/soundcard/FileSoundSource.h \
- libminisip/soundcard/AudioMixerSpatial.h \
- libminisip/soundcard/OssSoundDevice.h \
- libminisip/soundcard/SoundDevice.h \
- libminisip/soundcard/SilenceSensor.h \
- libminisip/soundcard/SoundIO.h \
- libminisip/soundcard/AudioMixerSimple.h \
- libminisip/soundcard/SoundDriver.h \
- libminisip/soundcard/SoundDriverRegistry.h \
- libminisip/spaudio/SpAudio.h \
- libminisip/video/mixer/ImageMixer.h \
- libminisip/video/grabber/Grabber.h \
- libminisip/video/display/VideoDisplay.h \
- libminisip/video/codec/AVDecoder.h \
- libminisip/video/codec/AVCoder.h \
- libminisip/video/codec/VideoCodec.h \
- libminisip/video/codec/VideoEncoderCallback.h \
- libminisip/video/ImageHandler.h \
- libminisip/video/VideoException.h \
- libminisip/video/VideoMedia.h \
- libminisip/conference/ConferenceControl.h \
- libminisip/conference/ConfMember.h \
- libminisip/conference/ConfCallback.h \
- libminisip/conference/ConfMessageRouter.h \
- libminisip/configbackend/ConfBackend.h \
- libminisip/configbackend/UserConfig.h \
- libminisip/configbackend/OnlineConfBackend.h \
- libminisip/contactdb/MXmlPhoneBookIo.h \
- libminisip/contactdb/OnlineMXmlPhoneBookIo.h \
- libminisip/contactdb/ContactDb.h \
- libminisip/contactdb/PhoneBook.h \
+ libminisip/media/MediaCommandString.h \
+ libminisip/media/RtpReceiver.h \
+ libminisip/media/DtmfSender.h \
+ libminisip/media/MediaStream.h \
+ libminisip/media/AudioMedia.h \
+ libminisip/media/SessionRegistry.h \
+ libminisip/media/MediaHandler.h \
+ libminisip/media/Media.h \
+ libminisip/media/Session.h \
+ libminisip/media/CallRecorder.h \
+ libminisip/signaling/p2t/SipDialogP2Tuser.h \
+ libminisip/signaling/p2t/SipDialogP2T.h \
+ libminisip/signaling/p2t/RtcpTransactionGrantFloor.h \
+ libminisip/signaling/p2t/GroupListUserElement.h \
+ libminisip/signaling/p2t/RtcpAPPHeader.h \
+ libminisip/signaling/p2t/RtcpAPP.h \
+ libminisip/signaling/p2t/GroupListClient.h \
+ libminisip/signaling/p2t/RtcpSender.h \
+ libminisip/signaling/p2t/P2T.h \
+ libminisip/signaling/p2t/RtcpTransactionIdleFloor.h \
+ libminisip/signaling/p2t/RtcpTransactionReleaseFloor.h \
+ libminisip/signaling/p2t/RtcpTransactionGetFloor.h \
+ libminisip/signaling/p2t/GroupListServer.h \
+ libminisip/signaling/p2t/RtcpReceiver.h \
+ libminisip/signaling/p2t/RtcpTransactionTakenFloor.h \
+ libminisip/signaling/p2t/GroupList.h \
+ libminisip/media/rtp/RtcpReportSenderInfo.h \
+ libminisip/media/rtp/XRVoIPReportBlock.h \
+ libminisip/media/rtp/SDES_LOC.h \
+ libminisip/media/rtp/SDES_NAME.h \
+ libminisip/media/rtp/RtcpDebugMonitor.h \
+ libminisip/media/rtp/XRReportBlock.h \
+ libminisip/media/rtp/SDES_CNAME.h \
+ libminisip/media/rtp/RtcpReport.h \
+ libminisip/media/rtp/RtcpReportSR.h \
+ libminisip/media/rtp/SDESItem.h \
+ libminisip/media/rtp/RtpHeader.h \
+ libminisip/media/rtp/SRtpPacket.h \
+ libminisip/media/rtp/SDESChunk.h \
+ libminisip/media/rtp/SDES_TOOL.h \
+ libminisip/media/rtp/RtpPacket.h \
+ libminisip/media/rtp/RtcpPacket.h \
+ libminisip/media/rtp/SDES_EMAIL.h \
+ libminisip/media/rtp/RtcpReportRR.h \
+ libminisip/media/rtp/RtcpReportXR.h \
+ libminisip/media/rtp/SDES_NOTE.h \
+ libminisip/media/rtp/RtcpReportSDES.h \
+ libminisip/media/rtp/CryptoContext.h \
+ libminisip/media/rtp/SDES_PHONE.h \
+ libminisip/media/rtp/RtcpReportReceptionBlock.h \
+ libminisip/signaling/sdp/SdpHeader.h \
+ libminisip/signaling/sdp/SdpHeaderA.h \
+ libminisip/signaling/sdp/SdpHeaderC.h \
+ libminisip/signaling/sdp/SdpHeaderM.h \
+ libminisip/signaling/sdp/SdpHeaderO.h \
+ libminisip/signaling/sdp/SdpPacket.h \
+ libminisip/signaling/sdp/SdpHeaderS.h \
+ libminisip/signaling/sdp/SdpHeaderT.h \
+ libminisip/signaling/sdp/SdpHeaderV.h \
+ libminisip/signaling/sip/SipDialogConfVoip.h \
+ libminisip/signaling/sip/SipDialogVoip.h \
+ libminisip/signaling/sip/Sip.h \
+ libminisip/signaling/sip/SipDialogPresenceClient.h \
+ libminisip/signaling/sip/SipDialogVoipServer.h \
+ libminisip/signaling/sip/DefaultDialogHandler.h \
+ libminisip/signaling/sip/PresenceMessageContent.h \
+ libminisip/signaling/sip/SipDialogVoipClient.h \
+ libminisip/signaling/sip/SipSoftPhoneConfiguration.h \
+ libminisip/signaling/sip/SipDialogPresenceServer.h \
+ libminisip/media/soundcard/Resampler.h \
+ libminisip/media/soundcard/SoundRecorderCallback.h \
+ libminisip/media/soundcard/WaveSoundDevice.h \
+ libminisip/media/soundcard/SoundIOPLCInterface.h \
+ libminisip/media/soundcard/AudioMixer.h \
+ libminisip/media/soundcard/SoundSource.h \
+ libminisip/media/soundcard/FileSoundSource.h \
+ libminisip/media/soundcard/AudioMixerSpatial.h \
+ libminisip/media/soundcard/OssSoundDevice.h \
+ libminisip/media/soundcard/SoundDevice.h \
+ libminisip/media/soundcard/SilenceSensor.h \
+ libminisip/media/soundcard/SoundIO.h \
+ libminisip/media/soundcard/AudioMixerSimple.h \
+ libminisip/media/soundcard/SoundDriver.h \
+ libminisip/media/soundcard/SoundDriverRegistry.h \
+ libminisip/media/spaudio/SpAudio.h \
+ libminisip/media/video/mixer/ImageMixer.h \
+ libminisip/media/video/grabber/Grabber.h \
+ libminisip/media/video/display/VideoDisplay.h \
+ libminisip/media/video/codec/AVDecoder.h \
+ libminisip/media/video/codec/AVCoder.h \
+ libminisip/media/video/codec/VideoCodec.h \
+ libminisip/media/video/codec/VideoEncoderCallback.h \
+ libminisip/media/video/ImageHandler.h \
+ libminisip/media/video/VideoException.h \
+ libminisip/media/video/VideoMedia.h \
+ libminisip/signaling/conference/ConferenceControl.h \
+ libminisip/signaling/conference/ConfMember.h \
+ libminisip/signaling/conference/ConfCallback.h \
+ libminisip/signaling/conference/ConfMessageRouter.h \
+ libminisip/config/ConfBackend.h \
+ libminisip/config/UserConfig.h \
+ libminisip/config/OnlineConfBackend.h \
+ libminisip/contacts/MXmlPhoneBookIo.h \
+ libminisip/contacts/OnlineMXmlPhoneBookIo.h \
+ libminisip/contacts/ContactDb.h \
+ libminisip/contacts/PhoneBook.h \
libminisip/ipprovider/SimpleIpProvider.h \
libminisip/ipprovider/StunIpProvider.h \
libminisip/ipprovider/IpProvider.h \
libminisip/Minisip.h \
libminisip/MinisipExceptions.h \
libminisip/libminisip_config.h \
- libminisip/zrtp/ZrtpHostBridgeMinisip.h
+ libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h
noinst_HEADERS = config.h
Modified: trunk/libminisip/include/libminisip/config/OnlineConfBackend.h
===================================================================
--- trunk/libminisip/include/libminisip/config/OnlineConfBackend.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/config/OnlineConfBackend.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,7 +26,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/configbackend/ConfBackend.h>
+#include<libminisip/config/ConfBackend.h>
#include<vector>
using namespace std;
Modified: trunk/libminisip/include/libminisip/contacts/MXmlPhoneBookIo.h
===================================================================
--- trunk/libminisip/include/libminisip/contacts/MXmlPhoneBookIo.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/contacts/MXmlPhoneBookIo.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/contactdb/PhoneBook.h>
+#include<libminisip/contacts/PhoneBook.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/contacts/OnlineMXmlPhoneBookIo.h
===================================================================
--- trunk/libminisip/include/libminisip/contacts/OnlineMXmlPhoneBookIo.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/contacts/OnlineMXmlPhoneBookIo.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -28,7 +28,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/contactdb/PhoneBook.h>
+#include<libminisip/contacts/PhoneBook.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/contacts/PhoneBook.h
===================================================================
--- trunk/libminisip/include/libminisip/contacts/PhoneBook.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/contacts/PhoneBook.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -32,7 +32,7 @@
#include<list>
#include<string>
-#include<libminisip/contactdb/ContactDb.h>
+#include<libminisip/contacts/ContactDb.h>
class PhoneBookPerson;
class PhoneBookIo;
Modified: trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h
===================================================================
--- trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,8 +30,8 @@
#include<libmutil/MemObject.h>
#include<libmutil/Thread.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
-#include<libminisip/mediahandler/MediaHandler.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/media/MediaHandler.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/gui/Gui.h
===================================================================
--- trunk/libminisip/include/libminisip/gui/Gui.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/gui/Gui.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libmutil/CommandString.h>
#include<libmutil/Thread.h>
#include<libmutil/MessageRouter.h>
-#include<libminisip/conference/ConfMessageRouter.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>
#include<libminisip/gui/LogEntry.h>
Modified: trunk/libminisip/include/libminisip/media/AudioMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/AudioMedia.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/AudioMedia.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,13 +27,13 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/mediahandler/Media.h>
+#include<libminisip/media/Media.h>
#ifdef AEC_SUPPORT
-#include<libminisip/aec/aec.h> //hanning
+#include<libminisip/media/aec/aec.h> //hanning
#endif
-#include<libminisip/soundcard/SoundSource.h>
+#include<libminisip/media/soundcard/SoundSource.h>
class AudioMediaSource;
class SilenceSensor;
Modified: trunk/libminisip/include/libminisip/media/CallRecorder.h
===================================================================
--- trunk/libminisip/include/libminisip/media/CallRecorder.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/CallRecorder.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,8 +27,8 @@
#define CALLREC_BUFF_SIZE 16000
-#include<libminisip/mediahandler/MediaStream.h>
-#include<libminisip/soundcard/SoundRecorderCallback.h>
+#include<libminisip/media/MediaStream.h>
+#include<libminisip/media/soundcard/SoundRecorderCallback.h>
template <class T> class MRef;
class MediaStreamReceiver;
Modified: trunk/libminisip/include/libminisip/media/Media.h
===================================================================
--- trunk/libminisip/include/libminisip/media/Media.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/Media.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -31,12 +31,12 @@
#include<libmutil/MPlugin.h>
#include<libmutil/MSingleton.h>
-#include<libminisip/soundcard/SoundRecorderCallback.h>
-#include<libminisip/soundcard/SoundIO.h>
+#include<libminisip/media/soundcard/SoundRecorderCallback.h>
+#include<libminisip/media/soundcard/SoundIO.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
-#include<libminisip/rtp/RtpPacket.h>
+#include<libminisip/media/rtp/RtpPacket.h>
class SoundIO;
class MediaStreamSender;
Modified: trunk/libminisip/include/libminisip/media/MediaHandler.h
===================================================================
--- trunk/libminisip/include/libminisip/media/MediaHandler.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/MediaHandler.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,10 +29,10 @@
#include<libmutil/MemObject.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/AudioMedia.h>
-#include<libminisip/mediahandler/MediaStream.h>
-#include<libminisip/mediahandler/Session.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/AudioMedia.h>
+#include<libminisip/media/MediaStream.h>
+#include<libminisip/media/Session.h>
#include<libminisip/ipprovider/IpProvider.h>
#include<libmutil/CommandString.h>
#include<libmutil/MessageRouter.h>
Modified: trunk/libminisip/include/libminisip/media/MediaStream.h
===================================================================
--- trunk/libminisip/include/libminisip/media/MediaStream.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/MediaStream.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,14 +29,14 @@
#include<libmutil/MemObject.h>
-#include<libminisip/rtp/CryptoContext.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/rtp/SRtpPacket.h>
+#include<libminisip/media/rtp/CryptoContext.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/Session.h>
+#include<libminisip/media/RtpReceiver.h>
+#include<libminisip/media/rtp/SRtpPacket.h>
#ifdef ZRTP_SUPPORT
-#include <libminisip/zrtp/ZrtpHostBridgeMinisip.h>
+#include <libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h>
#include <time.h>
class ZrtpHostBridgeMinisip;
#endif
Modified: trunk/libminisip/include/libminisip/media/Session.h
===================================================================
--- trunk/libminisip/include/libminisip/media/Session.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/Session.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -32,10 +32,10 @@
#include<libmikey/Mikey.h>
-//#include<libminisip/sip/SipDialogSecurityConfig.h>
+//#include<libminisip/signaling/sip/SipDialogSecurityConfig.h>
#include<libmsip/SipDialogConfig.h>
-#include<libminisip/mediahandler/DtmfSender.h>
-#include<libminisip/sdp/SdpPacket.h>
+#include<libminisip/media/DtmfSender.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
class MediaStreamReceiver;
class MediaStreamSender;
@@ -290,6 +290,6 @@
};
-#include<libminisip/mediahandler/SessionRegistry.h>
+#include<libminisip/media/SessionRegistry.h>
#endif
Modified: trunk/libminisip/include/libminisip/media/SessionRegistry.h
===================================================================
--- trunk/libminisip/include/libminisip/media/SessionRegistry.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/SessionRegistry.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libmutil/MemObject.h>
#include<libmutil/Mutex.h>
-#include<libminisip/mediahandler/Session.h>
+#include<libminisip/media/Session.h>
class LIBMINISIP_API SessionRegistry{
Modified: trunk/libminisip/include/libminisip/media/rtp/CryptoContext.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/CryptoContext.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/CryptoContext.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -34,7 +34,7 @@
#include<libmcrypto/hmac.h>
#include<libmutil/MemObject.h>
-#include<libminisip/rtp/RtpPacket.h>
+#include<libminisip/media/rtp/RtpPacket.h>
#define REPLAY_WINDOW_SIZE 64
Modified: trunk/libminisip/include/libminisip/media/rtp/RtcpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtcpPacket.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtcpPacket.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,7 +29,7 @@
#include<vector>
-#include<libminisip/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/RtcpReport.h>
#include<config.h>
Modified: trunk/libminisip/include/libminisip/media/rtp/RtcpReportRR.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtcpReportRR.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtcpReportRR.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,8 +27,8 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/RtcpReport.h>
-#include<libminisip/rtp/RtcpReportReceptionBlock.h>
+#include<libminisip/media/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/RtcpReportReceptionBlock.h>
#include<vector>
Modified: trunk/libminisip/include/libminisip/media/rtp/RtcpReportSDES.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtcpReportSDES.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtcpReportSDES.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,8 +27,8 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/RtcpReport.h>
-#include<libminisip/rtp/SDESChunk.h>
+#include<libminisip/media/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/SDESChunk.h>
class LIBMINISIP_API RtcpReportSDES : public RtcpReport{
public:
Modified: trunk/libminisip/include/libminisip/media/rtp/RtcpReportSR.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtcpReportSR.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtcpReportSR.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,9 +27,9 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/RtcpReport.h>
-#include<libminisip/rtp/RtcpReportReceptionBlock.h>
-#include<libminisip/rtp/RtcpReportSenderInfo.h>
+#include<libminisip/media/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/RtcpReportReceptionBlock.h>
+#include<libminisip/media/rtp/RtcpReportSenderInfo.h>
#include<vector>
Modified: trunk/libminisip/include/libminisip/media/rtp/RtcpReportXR.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtcpReportXR.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtcpReportXR.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,8 +29,8 @@
#include<vector>
-#include<libminisip/rtp/XRReportBlock.h>
-#include<libminisip/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/XRReportBlock.h>
+#include<libminisip/media/rtp/RtcpReport.h>
class LIBMINISIP_API RtcpReportXR : public RtcpReport{
public:
Modified: trunk/libminisip/include/libminisip/media/rtp/RtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/RtpPacket.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/RtpPacket.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -32,7 +32,7 @@
#include<libmnetutil/UDPSocket.h>
#include<libmnetutil/IPAddress.h>
-#include<libminisip/rtp/RtpHeader.h>
+#include<libminisip/media/rtp/RtpHeader.h>
/**
* This class implements the RTP header.
Modified: trunk/libminisip/include/libminisip/media/rtp/SDESChunk.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDESChunk.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDESChunk.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,7 +29,7 @@
#include<vector>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
class LIBMINISIP_API SDESChunk{
public:
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_CNAME.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_CNAME.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_CNAME.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_EMAIL.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_EMAIL.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_EMAIL.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_LOC.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_LOC.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_LOC.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_NAME.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_NAME.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_NAME.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_NOTE.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_NOTE.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_NOTE.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_PHONE.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_PHONE.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_PHONE.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SDES_TOOL.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SDES_TOOL.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SDES_TOOL.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/SDESItem.h>
+#include<libminisip/media/rtp/SDESItem.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/media/rtp/SRtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/SRtpPacket.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/SRtpPacket.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,8 +30,8 @@
#include<libmnetutil/UDPSocket.h>
#include<libmnetutil/IPAddress.h>
-#include<libminisip/rtp/CryptoContext.h>
-#include<libminisip/rtp/RtpPacket.h>
+#include<libminisip/media/rtp/CryptoContext.h>
+#include<libminisip/media/rtp/RtpPacket.h>
RtpPacket * readRtpPacket( MRef<CryptoContext *>, UDPSocket * socket );
Modified: trunk/libminisip/include/libminisip/media/rtp/XRVoIPReportBlock.h
===================================================================
--- trunk/libminisip/include/libminisip/media/rtp/XRVoIPReportBlock.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/rtp/XRVoIPReportBlock.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/rtp/XRReportBlock.h>
+#include<libminisip/media/rtp/XRReportBlock.h>
class LIBMINISIP_API XRVoIPReportBlock : public XRReportBlock{
public:
Modified: trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSimple.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSimple.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSimple.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/soundcard/AudioMixer.h>
+#include<libminisip/media/soundcard/AudioMixer.h>
class SoundSource;
Modified: trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSpatial.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSpatial.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/AudioMixerSpatial.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/soundcard/AudioMixer.h>
+#include<libminisip/media/soundcard/AudioMixer.h>
class SoundSource;
class SpAudio;
Modified: trunk/libminisip/include/libminisip/media/soundcard/FileSoundSource.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/FileSoundSource.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/FileSoundSource.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -28,7 +28,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/soundcard/SoundSource.h>
+#include<libminisip/media/soundcard/SoundSource.h>
class Resampler;
Modified: trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/OssSoundDevice.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -28,7 +28,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
#ifndef DISABLE_OSS
Modified: trunk/libminisip/include/libminisip/media/soundcard/SoundDriver.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/SoundDriver.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/SoundDriver.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -31,7 +31,7 @@
#include<iterator>
#include<libmutil/MemObject.h>
-#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
#include<vector>
Modified: trunk/libminisip/include/libminisip/media/soundcard/SoundDriverRegistry.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/SoundDriverRegistry.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/SoundDriverRegistry.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libmutil/MemObject.h>
#include<libmutil/MPlugin.h>
#include<libmutil/MSingleton.h>
-#include<libminisip/soundcard/SoundDriver.h>
+#include<libminisip/media/soundcard/SoundDriver.h>
/**
* Registry of sound driver plugins.
Modified: trunk/libminisip/include/libminisip/media/soundcard/SoundIO.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/SoundIO.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/SoundIO.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,7 +29,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/soundcard/SoundRecorderCallback.h>
+#include<libminisip/media/soundcard/SoundRecorderCallback.h>
class SoundIOPLCInterface;
#include<libmutil/Mutex.h>
@@ -43,7 +43,7 @@
class SoundSource;
//we need sounddevice.h for some defines
-#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
//class SoundDevice;
Modified: trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/SoundSource.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -31,8 +31,8 @@
#include<libmutil/Mutex.h>
-#include<libminisip/soundcard/SoundIOPLCInterface.h>
-#include<libminisip/soundcard/Resampler.h>
+#include<libminisip/media/soundcard/SoundIOPLCInterface.h>
+#include<libminisip/media/soundcard/Resampler.h>
#define LEFT 1
#define RIGHT 5
Modified: trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h
===================================================================
--- trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/soundcard/WaveSoundDevice.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -7,8 +7,8 @@
#include <commctrl.h>
#include <iostream>
#include <mmsystem.h>
-#include<libminisip/soundcard/SoundDevice.h>
-#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
class LIBMINISIP_API WaveSoundDevice:public SoundDevice{
Modified: trunk/libminisip/include/libminisip/media/video/VideoMedia.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/VideoMedia.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/VideoMedia.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,14 +27,14 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/mediahandler/MediaHandler.h>
-#include<libminisip/video/ImageHandler.h>
-#include<libminisip/video/display/VideoDisplay.h>
-#include<libminisip/video/codec/AVDecoder.h>
-#include<libminisip/video/codec/VideoEncoderCallback.h>
-#include<libminisip/video/grabber/Grabber.h>
+#include<libminisip/media/MediaHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
+#include<libminisip/media/video/display/VideoDisplay.h>
+#include<libminisip/media/video/codec/AVDecoder.h>
+#include<libminisip/media/video/codec/VideoEncoderCallback.h>
+#include<libminisip/media/video/grabber/Grabber.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
#define MAX_SOURCES 256
Modified: trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/codec/AVCoder.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<string>
-#include<libminisip/video/ImageHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
#include<libmutil/MemObject.h>
#include<avcodec.h>
Modified: trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/codec/AVDecoder.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/video/ImageHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
class ImageHandler;
class MImage;
Modified: trunk/libminisip/include/libminisip/media/video/codec/VideoCodec.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/codec/VideoCodec.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/codec/VideoCodec.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,8 +27,8 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/video/ImageHandler.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/video/ImageHandler.h>
+#include<libminisip/media/codecs/Codec.h>
class MediaStreamSender;
class AVEncoder;
Modified: trunk/libminisip/include/libminisip/media/video/display/VideoDisplay.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/display/VideoDisplay.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/display/VideoDisplay.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -36,7 +36,7 @@
#include<libmutil/MPlugin.h>
#include<libmutil/MSingleton.h>
-#include<libminisip/video/ImageHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
class LIBMINISIP_API VideoDisplay : public ImageHandler, public Runnable{
public:
Modified: trunk/libminisip/include/libminisip/media/video/grabber/Grabber.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/grabber/Grabber.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/grabber/Grabber.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/video/ImageHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
#include<libmutil/MemObject.h>
#include<libmutil/MSingleton.h>
Modified: trunk/libminisip/include/libminisip/media/video/mixer/ImageMixer.h
===================================================================
--- trunk/libminisip/include/libminisip/media/video/mixer/ImageMixer.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/media/video/mixer/ImageMixer.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,11 +27,11 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/video/ImageHandler.h>
+#include<libminisip/media/video/ImageHandler.h>
#include<libmutil/MemObject.h>
#include<libmutil/Mutex.h>
-#include<libminisip/video/VideoMedia.h>
+#include<libminisip/media/video/VideoMedia.h>
class LIBMINISIP_API ImageMixer : public ImageHandler, public MObject{
public:
Copied: trunk/libminisip/include/libminisip/signaling/conference (from rev 3242, trunk/libminisip/include/libminisip/conference)
Modified: trunk/libminisip/include/libminisip/signaling/conference/ConfCallback.h
===================================================================
--- trunk/libminisip/include/libminisip/conference/ConfCallback.h 2007-03-12 22:09:23 UTC (rev 3242)
+++ trunk/libminisip/include/libminisip/signaling/conference/ConfCallback.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,7 +29,7 @@
#include<libmutil/CommandString.h>
-#include<libminisip/conference/ConfMember.h>
+#include<libminisip/signaling/conference/ConfMember.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h
===================================================================
--- trunk/libminisip/include/libminisip/conference/ConfMessageRouter.h 2007-03-12 22:09:23 UTC (rev 3242)
+++ trunk/libminisip/include/libminisip/signaling/conference/ConfMessageRouter.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,10 +29,10 @@
#include<libmutil/minilist.h>
-#include<libminisip/sip/Sip.h>
+#include<libminisip/signaling/sip/Sip.h>
#include<libminisip/gui/Gui.h>
-#include<libminisip/conference/ConferenceControl.h>
-#include<libminisip/conference/ConfCallback.h>
+#include<libminisip/signaling/conference/ConferenceControl.h>
+#include<libminisip/signaling/conference/ConfCallback.h>
class Gui;
Modified: trunk/libminisip/include/libminisip/signaling/conference/ConferenceControl.h
===================================================================
--- trunk/libminisip/include/libminisip/conference/ConferenceControl.h 2007-03-12 22:09:23 UTC (rev 3242)
+++ trunk/libminisip/include/libminisip/signaling/conference/ConferenceControl.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -32,8 +32,8 @@
#include<libmutil/CommandString.h>
#include<libmutil/minilist.h>
-#include<libminisip/conference/ConfCallback.h>
-#include<libminisip/conference/ConfMember.h>
+#include<libminisip/signaling/conference/ConfCallback.h>
+#include<libminisip/signaling/conference/ConfMember.h>
/**
* A text user interface.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/GroupList.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/GroupList.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/GroupList.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -33,9 +33,9 @@
#include<libmnetutil/IPAddress.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/GroupListUserElement.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/GroupListUserElement.h>
+#include<libminisip/media/codecs/Codec.h>
/**
* the GroupList contains all information about a P2T Session
Modified: trunk/libminisip/include/libminisip/signaling/p2t/GroupListClient.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/GroupListClient.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/GroupListClient.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -32,8 +32,8 @@
#include<libmnetutil/IPAddress.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/GroupList.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/GroupList.h>
/**
Modified: trunk/libminisip/include/libminisip/signaling/p2t/GroupListServer.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/GroupListServer.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/GroupListServer.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -37,9 +37,9 @@
#include<libmnetutil/ServerSocket.h>
#include<libmnetutil/TCPSocket.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/GroupList.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/GroupList.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
Modified: trunk/libminisip/include/libminisip/signaling/p2t/GroupListUserElement.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/GroupListUserElement.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/GroupListUserElement.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -33,8 +33,8 @@
#include<libmnetutil/IPAddress.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/p2t/P2T.h>
+#include<libminisip/media/codecs/Codec.h>
+#include<libminisip/signaling/p2t/P2T.h>
/**
* contains all information about a participating user in a <code>GroupList</code>.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpAPP.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpAPP.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpAPP.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,10 +27,10 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/p2t/RtcpAPPHeader.h>
+#include<libminisip/signaling/p2t/RtcpAPPHeader.h>
#include<libmnetutil/UDPSocket.h>
#include<libmnetutil/IPAddress.h>
-#include<libminisip/p2t/P2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
#if BYTE_ORDER == LITTLE_ENDIAN
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpReceiver.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpReceiver.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpReceiver.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -33,9 +33,9 @@
#include<libmsip/SipDialog.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include<libminisip/gui/Gui.h>
-#include<libminisip/p2t/P2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
/**
* receives RTCP packets.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpSender.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpSender.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpSender.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -38,7 +38,7 @@
#include<libmnetutil/IPAddress.h>
#include<libmnetutil/UDPSocket.h>
-#include<libminisip/p2t/P2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
#include<libmsip/SipDialog.h>
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGetFloor.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGetFloor.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGetFloor.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -34,9 +34,9 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipTransaction.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/SipDialogP2T.h>
-#include<libminisip/p2t/GroupListUserElement.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/SipDialogP2T.h>
+#include<libminisip/signaling/p2t/GroupListUserElement.h>
//#include<config.h>
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGrantFloor.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGrantFloor.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionGrantFloor.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,8 +30,8 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipTransaction.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/SipDialogP2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/SipDialogP2T.h>
/**
* implements the Floor Request Procedure if a remote user wants to take the floor.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionIdleFloor.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionIdleFloor.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionIdleFloor.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,8 +30,8 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipTransaction.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/SipDialogP2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/SipDialogP2T.h>
/**
* implements the Floor Release Procedure if a remote user releases the floor..
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionReleaseFloor.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionReleaseFloor.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionReleaseFloor.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -40,7 +40,7 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipTransaction.h>
-#include<libminisip/p2t/P2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
/**
* implements the Floor Release Procedure if the local user releases the floor.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionTakenFloor.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionTakenFloor.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/RtcpTransactionTakenFloor.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,8 +30,8 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipTransaction.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/SipDialogP2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/SipDialogP2T.h>
/**
* sends a Floor TAKEN message to a remote user.
Modified: trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2T.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2T.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2T.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,15 +35,15 @@
#include<libmsip/SipResponse.h>
#include<libmsip/SipStack.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/p2t/RtcpReceiver.h>
-#include<libminisip/p2t/RtcpSender.h>
-#include<libminisip/p2t/GroupList.h>
-#include<libminisip/p2t/GroupListUserElement.h>
-#include<libminisip/p2t/GroupListClient.h>
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/mediahandler/MediaHandler.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/media/codecs/Codec.h>
+#include<libminisip/signaling/p2t/RtcpReceiver.h>
+#include<libminisip/signaling/p2t/RtcpSender.h>
+#include<libminisip/signaling/p2t/GroupList.h>
+#include<libminisip/signaling/p2t/GroupListUserElement.h>
+#include<libminisip/signaling/p2t/GroupListClient.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/media/MediaHandler.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
/**
Modified: trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2Tuser.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2Tuser.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/p2t/SipDialogP2Tuser.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -44,11 +44,11 @@
#include<libmsip/SipBye.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
//P2T//
-#include<libminisip/p2t/P2T.h>
-#include<libminisip/p2t/SipDialogP2T.h>
+#include<libminisip/signaling/p2t/P2T.h>
+#include<libminisip/signaling/p2t/SipDialogP2T.h>
/**
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderA.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderA.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderA.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#ifndef SDPHEADERA_H
#define SDPHEADERA_H
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
class LIBMINISIP_API SdpHeaderA : public SdpHeader{
public:
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderC.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderC.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderC.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
#include<string>
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderM.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderM.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderM.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -36,8 +36,8 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
-#include<libminisip/sdp/SdpHeaderC.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeaderC.h>
#include<vector>
class SdpHeaderA;
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderO.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderO.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderO.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
class LIBMINISIP_API SdpHeaderO : public SdpHeader{
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderS.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderS.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderS.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
class LIBMINISIP_API SdpHeaderS : public SdpHeader{
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderT.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderT.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderT.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
class LIBMINISIP_API SdpHeaderT : public SdpHeader{
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderV.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderV.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpHeaderV.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -35,7 +35,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
class LIBMINISIP_API SdpHeaderV : public SdpHeader{
Modified: trunk/libminisip/include/libminisip/signaling/sdp/SdpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sdp/SdpPacket.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sdp/SdpPacket.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -44,9 +44,9 @@
#include<libmsip/SipMessageContent.h>
#include<libmsip/SipMessageContentFactory.h>
-#include<libminisip/sdp/SdpPacket.h>
-#include<libminisip/sdp/SdpHeader.h>
-#include<libminisip/sdp/SdpHeaderC.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
+#include<libminisip/signaling/sdp/SdpHeader.h>
+#include<libminisip/signaling/sdp/SdpHeaderC.h>
MRef<SipMessageContent*> sdpSipMessageContentFactory(const std::string & buf, const std::string & ContentType);
Modified: trunk/libminisip/include/libminisip/signaling/sip/DefaultDialogHandler.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/DefaultDialogHandler.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/DefaultDialogHandler.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -33,10 +33,10 @@
#include<libmsip/SipSMCommand.h>
#include<libmsip/SipDialogConfig.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#ifdef P2T_SUPPORT
-# include<libminisip/p2t/GroupListServer.h>
-# include<libminisip/p2t/SipDialogP2T.h>
+# include<libminisip/signaling/p2t/GroupListServer.h>
+# include<libminisip/signaling/p2t/SipDialogP2T.h>
#endif
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/Sip.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/Sip.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/Sip.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -33,10 +33,10 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipStack.h>
-#include<libminisip/sdp/SdpPacket.h>
-#include<libminisip/conference/ConfMember.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
+#include<libminisip/signaling/conference/ConfMember.h>
#include<libminisip/gui/LogEntry.h>
-#include<libminisip/mediahandler/MediaHandler.h>
+#include<libminisip/media/MediaHandler.h>
class SipSoftPhoneConfiguration;
class MediaHandler;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogConfVoip.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -42,7 +42,7 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceClient.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceClient.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceClient.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -41,7 +41,7 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceServer.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceServer.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogPresenceServer.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -41,7 +41,7 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoip.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoip.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoip.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -41,7 +41,7 @@
#include<libmsip/SipResponse.h>
#include<libmutil/StateMachine.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipClient.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipClient.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipClient.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -42,8 +42,8 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipDialogVoip.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipDialogVoip.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipServer.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipServer.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipDialogVoipServer.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -48,8 +48,8 @@
#include<libmsip/SipDialog.h>
#include<libmsip/SipResponse.h>
-#include<libminisip/sip/SipDialogVoip.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipDialogVoip.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
class Session;
class SipDialogContainer;
Modified: trunk/libminisip/include/libminisip/signaling/sip/SipSoftPhoneConfiguration.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/sip/SipSoftPhoneConfiguration.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/sip/SipSoftPhoneConfiguration.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -44,9 +44,9 @@
#include<libmsip/SipDialogConfig.h>
-#include<libminisip/sip/Sip.h>
-#include<libminisip/contactdb/PhoneBook.h>
-#include<libminisip/configbackend/ConfBackend.h>
+#include<libminisip/signaling/sip/Sip.h>
+#include<libminisip/contacts/PhoneBook.h>
+#include<libminisip/config/ConfBackend.h>
class IPAddress;
class Socket;
Modified: trunk/libminisip/include/libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h
===================================================================
--- trunk/libminisip/include/libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/include/libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -36,9 +36,9 @@
#include <libmutil/MessageRouter.h>
#include <libmsip/SipSMCommand.h>
-#include <libminisip/mediahandler/MediaStream.h>
-#include <libminisip/rtp/SRtpPacket.h>
-#include <libminisip/rtp/CryptoContext.h>
+#include <libminisip/media/MediaStream.h>
+#include <libminisip/media/rtp/SRtpPacket.h>
+#include <libminisip/media/rtp/CryptoContext.h>
#include <libzrtpcpp/ZrtpCallback.h>
#include <libzrtpcpp/ZRtp.h>
Modified: trunk/libminisip/source/Minisip.cxx
===================================================================
--- trunk/libminisip/source/Minisip.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/Minisip.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -63,19 +63,19 @@
#include<libminisip/gui/Gui.h>
#include<libminisip/gui/ConsoleDebugger.h>
-#include<libminisip/sip/Sip.h>
+#include<libminisip/signaling/sip/Sip.h>
#include<libminisip/gui/LogEntry.h>
-#include<libminisip/contactdb/ContactDb.h>
-#include<libminisip/mediahandler/MediaHandler.h>
-#include<libminisip/conference/ConferenceControl.h>
-#include<libminisip/conference/ConfCallback.h>
-#include<libminisip/configbackend/ConfBackend.h>
-#include<libminisip/conference/ConfMessageRouter.h>
-#include<libminisip/soundcard/SoundDriverRegistry.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/contacts/ContactDb.h>
+#include<libminisip/media/MediaHandler.h>
+#include<libminisip/signaling/conference/ConferenceControl.h>
+#include<libminisip/signaling/conference/ConfCallback.h>
+#include<libminisip/config/ConfBackend.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>
+#include<libminisip/media/soundcard/SoundDriverRegistry.h>
+#include<libminisip/media/codecs/Codec.h>
#ifdef ZRTP_SUPPORT
-#include<libminisip/zrtp/ZrtpHostBridgeMinisip.h>
+#include<libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h>
#endif
#include<stdlib.h>
Modified: trunk/libminisip/source/aec/aec.cxx
===================================================================
--- trunk/libminisip/source/aec/aec.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/aec/aec.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -17,7 +17,7 @@
#include <math.h>
#include <string.h>
-#include<libminisip/aec/aec.h>
+#include<libminisip/media/aec/aec.h>
#ifdef _WIN32_WCE
# define M_PI 3.14159265358979323846 /* pi */
Modified: trunk/libminisip/source/conference/ConfMessageRouter.cxx
===================================================================
--- trunk/libminisip/source/conference/ConfMessageRouter.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/conference/ConfMessageRouter.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include<config.h>
-#include<libminisip/conference/ConfMessageRouter.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>
#include<iostream>
Modified: trunk/libminisip/source/conference/ConferenceControl.cxx
===================================================================
--- trunk/libminisip/source/conference/ConferenceControl.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/conference/ConferenceControl.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,12 +24,12 @@
#include<config.h>
-#include<libminisip/conference/ConferenceControl.h>
+#include<libminisip/signaling/conference/ConferenceControl.h>
#include<assert.h>
#include<stdio.h>
#include<vector>
-#include<libminisip/conference/ConfMessageRouter.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>
#include<libminisip/gui/Gui.h>
#include<libmutil/MemObject.h>
Modified: trunk/libminisip/source/ipprovider/IpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/IpProvider.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/ipprovider/IpProvider.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/ipprovider/SimpleIpProvider.h>
#include<libminisip/ipprovider/StunIpProvider.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include"SimpleIp6Provider.h"
#ifdef _WIN32_WCE
Modified: trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -23,7 +23,7 @@
#include<config.h>
#include"SimpleIp6Provider.h"
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include<libmnetutil/NetworkFunctions.h>
#include<libmnetutil/UDPSocket.h>
Modified: trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,7 +26,7 @@
#include<libminisip/ipprovider/SimpleIpProvider.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include<libmnetutil/NetworkFunctions.h>
#include<libmnetutil/UDPSocket.h>
Modified: trunk/libminisip/source/ipprovider/StunIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/StunIpProvider.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/ipprovider/StunIpProvider.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,7 +26,7 @@
#include<libminisip/ipprovider/StunIpProvider.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include<libmnetutil/IPAddress.h>
#include<libmnetutil/UDPSocket.h>
#include<libmnetutil/NetworkFunctions.h>
Modified: trunk/libminisip/source/subsystem_config/ConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/ConfBackend.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/ConfBackend.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,8 +24,8 @@
#include<config.h>
-#include<libminisip/configbackend/ConfBackend.h>
-#include<libminisip/configbackend/OnlineConfBackend.h>
+#include<libminisip/config/ConfBackend.h>
+#include<libminisip/config/OnlineConfBackend.h>
#include"MXmlConfBackend.h"
using namespace std;
Modified: trunk/libminisip/source/subsystem_config/GConfBackend.h
===================================================================
--- trunk/libminisip/source/subsystem_config/GConfBackend.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/GConfBackend.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/configbackend/ConfBackend.h>
+#include<libminisip/config/ConfBackend.h>
typedef struct _GConfClient GConfClient;
Modified: trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/MXmlConfBackend.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -25,7 +25,7 @@
#include<config.h>
#include"MXmlConfBackend.h"
-#include<libminisip/configbackend/UserConfig.h>
+#include<libminisip/config/UserConfig.h>
#include<libmutil/XMLParser.h>
#include<libmutil/stringutils.h>
Modified: trunk/libminisip/source/subsystem_config/MXmlConfBackend.h
===================================================================
--- trunk/libminisip/source/subsystem_config/MXmlConfBackend.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/MXmlConfBackend.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -25,7 +25,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/configbackend/ConfBackend.h>
+#include<libminisip/config/ConfBackend.h>
class XMLFileParser;
Modified: trunk/libminisip/source/subsystem_config/OnlineConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/OnlineConfBackend.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/OnlineConfBackend.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -22,7 +22,7 @@
*/
#include<stdlib.h>
-#include<libminisip/configbackend/OnlineConfBackend.h>
+#include<libminisip/config/OnlineConfBackend.h>
#include<libmnetutil/TlsSrpSocket.h>
#include<libmcrypto/cert.h>
#include<libmnetutil/NetworkException.h>
Modified: trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,8 +26,8 @@
#include<config.h>
#include"OnlineMXmlConfBackend.h"
-#include"libminisip/configbackend/OnlineConfBackend.h"
-#include<libminisip/configbackend/UserConfig.h>
+#include"libminisip/config/OnlineConfBackend.h"
+#include<libminisip/config/UserConfig.h>
#include<libmutil/XMLParser.h>
#include<libmutil/stringutils.h>
Modified: trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.h
===================================================================
--- trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/OnlineMXmlConfBackend.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/configbackend/ConfBackend.h>
+#include<libminisip/config/ConfBackend.h>
#include<vector>
using namespace std;
class XMLFileParser;
Modified: trunk/libminisip/source/subsystem_config/UserConfigPosix.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/UserConfigPosix.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/UserConfigPosix.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -22,7 +22,7 @@
#include<config.h>
-#include<libminisip/configbackend/UserConfig.h>
+#include<libminisip/config/UserConfig.h>
#include<libmutil/dbg.h>
#include<stdlib.h>
Modified: trunk/libminisip/source/subsystem_config/UserConfigWin32.cxx
===================================================================
--- trunk/libminisip/source/subsystem_config/UserConfigWin32.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_config/UserConfigWin32.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -22,7 +22,7 @@
#include<config.h>
-#include<libminisip/configbackend/UserConfig.h>
+#include<libminisip/config/UserConfig.h>
#include<shlobj.h>
#include<io.h>
Modified: trunk/libminisip/source/subsystem_contacts/ContactDb.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/ContactDb.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_contacts/ContactDb.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,9 +24,9 @@
#include<config.h>
-#include<libminisip/contactdb/ContactDb.h>
+#include<libminisip/contacts/ContactDb.h>
-#include<libminisip/contactdb/PhoneBook.h>
+#include<libminisip/contacts/PhoneBook.h>
using namespace std;
Modified: trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_contacts/MXmlPhoneBookIo.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,10 +24,10 @@
#include<config.h>
-#include<libminisip/contactdb/MXmlPhoneBookIo.h>
+#include<libminisip/contacts/MXmlPhoneBookIo.h>
-#include<libminisip/contactdb/PhoneBook.h>
-#include<libminisip/contactdb/ContactDb.h>
+#include<libminisip/contacts/PhoneBook.h>
+#include<libminisip/contacts/ContactDb.h>
#include<libmutil/XMLParser.h>
#include<libmutil/stringutils.h>
Modified: trunk/libminisip/source/subsystem_contacts/OnlineMXmlPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/OnlineMXmlPhoneBookIo.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_contacts/OnlineMXmlPhoneBookIo.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,10 +24,10 @@
#include<config.h>
-#include<libminisip/contactdb/OnlineMXmlPhoneBookIo.h>
+#include<libminisip/contacts/OnlineMXmlPhoneBookIo.h>
-#include<libminisip/contactdb/PhoneBook.h>
-#include<libminisip/contactdb/ContactDb.h>
+#include<libminisip/contacts/PhoneBook.h>
+#include<libminisip/contacts/ContactDb.h>
#include<libmutil/XMLParser.h>
#include<libmutil/stringutils.h>
@@ -35,7 +35,7 @@
#include<string>
#include<fstream>
#include<vector>
-#include<libminisip/configbackend/OnlineConfBackend.h>
+#include<libminisip/config/OnlineConfBackend.h>
using namespace std;
OnlineMXmlPhoneBookIo::OnlineMXmlPhoneBookIo(OnlineConfBack *confback)
Modified: trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_contacts/PhoneBook.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,9 +24,9 @@
#include<config.h>
-#include<libminisip/contactdb/PhoneBook.h>
+#include<libminisip/contacts/PhoneBook.h>
-#include<libminisip/contactdb/ContactDb.h>
+#include<libminisip/contacts/ContactDb.h>
using namespace std;
Modified: trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx
===================================================================
--- trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_gui/ConsoleDebugger.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -30,7 +30,7 @@
#include<libmsip/SipCommandString.h>
#include<libmsip/SipSMCommand.h>
-#include<libminisip/mediahandler/MediaCommandString.h>
+#include<libminisip/media/MediaCommandString.h>
#include<iostream>
Modified: trunk/libminisip/source/subsystem_gui/Gui.cxx
===================================================================
--- trunk/libminisip/source/subsystem_gui/Gui.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_gui/Gui.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,7 +26,7 @@
#include<libminisip/gui/Gui.h>
-#include<libminisip/conference/ConfMessageRouter.h>
+#include<libminisip/signaling/conference/ConfMessageRouter.h>
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
Modified: trunk/libminisip/source/subsystem_media/AudioMedia.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/AudioMedia.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,16 +24,16 @@
#include <config.h>
-#include<libminisip/mediahandler/AudioMedia.h>
+#include<libminisip/media/AudioMedia.h>
-#include<libminisip/rtp/RtpHeader.h>
-#include<libminisip/mediahandler/MediaStream.h>
-#include<libminisip/soundcard/FileSoundSource.h>
+#include<libminisip/media/rtp/RtpHeader.h>
+#include<libminisip/media/MediaStream.h>
+#include<libminisip/media/soundcard/FileSoundSource.h>
-#include<libminisip/soundcard/Resampler.h>
-#include<libminisip/soundcard/SoundSource.h>
+#include<libminisip/media/soundcard/Resampler.h>
+#include<libminisip/media/soundcard/SoundSource.h>
-#include<libminisip/rtp/RtpPacket.h>
+#include<libminisip/media/rtp/RtpPacket.h>
#define RINGTONE_SOURCE_ID 0x42124212
Modified: trunk/libminisip/source/subsystem_media/AudioPlugin.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioPlugin.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/AudioPlugin.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,9 +24,9 @@
#include<config.h>
#include"AudioPlugin.h"
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
using namespace std;
Modified: trunk/libminisip/source/subsystem_media/AudioPlugin.h
===================================================================
--- trunk/libminisip/source/subsystem_media/AudioPlugin.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/AudioPlugin.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -25,7 +25,7 @@
#define AUDIO_MEDIA_PLUGIN_H
#include<libminisip/libminisip_config.h>
-#include<libminisip/mediahandler/Media.h>
+#include<libminisip/media/Media.h>
class Media;
class SipSoftPhoneConfiguration;
Modified: trunk/libminisip/source/subsystem_media/CallRecorder.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/CallRecorder.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/CallRecorder.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -23,9 +23,9 @@
#include<config.h>
-#include<libminisip/mediahandler/CallRecorder.h>
+#include<libminisip/media/CallRecorder.h>
-#include<libminisip/mediahandler/AudioMedia.h>
+#include<libminisip/media/AudioMedia.h>
#include"soundcard/FileSoundDevice.h"
#include<libmutil/stringutils.h>
Modified: trunk/libminisip/source/subsystem_media/DtmfSender.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/DtmfSender.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/DtmfSender.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,10 +24,10 @@
#include <config.h>
-#include<libminisip/mediahandler/DtmfSender.h>
+#include<libminisip/media/DtmfSender.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/MediaStream.h>
+#include<libminisip/media/Session.h>
+#include<libminisip/media/MediaStream.h>
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
Modified: trunk/libminisip/source/subsystem_media/Media.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/Media.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/Media.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,16 +24,16 @@
#include <config.h>
-#include<libminisip/mediahandler/Media.h>
+#include<libminisip/media/Media.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/soundcard/SoundIO.h>
+#include<libminisip/media/codecs/Codec.h>
+#include<libminisip/media/soundcard/SoundIO.h>
#include<libminisip/ipprovider/IpProvider.h>
-#include<libminisip/mediahandler/MediaStream.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
+#include<libminisip/media/MediaStream.h>
+#include<libminisip/media/RtpReceiver.h>
#include<libmutil/stringutils.h>
-#include<libminisip/sdp/SdpHeaderM.h>
-#include<libminisip/sdp/SdpHeaderA.h>
+#include<libminisip/signaling/sdp/SdpHeaderM.h>
+#include<libminisip/signaling/sdp/SdpHeaderA.h>
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
Modified: trunk/libminisip/source/subsystem_media/MediaCommandString.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaCommandString.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/MediaCommandString.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include <config.h>
-#include<libminisip/mediahandler/MediaCommandString.h>
+#include<libminisip/media/MediaCommandString.h>
using namespace std;
Modified: trunk/libminisip/source/subsystem_media/MediaHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/MediaHandler.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,27 +24,27 @@
#include <config.h>
-#include<libminisip/mediahandler/MediaHandler.h>
+#include<libminisip/media/MediaHandler.h>
#include<string.h>
-#include<libminisip/sdp/SdpPacket.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
#include<libmikey/KeyAgreement.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
+#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
#include<libminisip/ipprovider/IpProvider.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/MediaStream.h>
+#include<libminisip/media/codecs/Codec.h>
+#include<libminisip/media/Session.h>
+#include<libminisip/media/MediaStream.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/mediahandler/MediaCommandString.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/RtpReceiver.h>
+#include<libminisip/media/MediaCommandString.h>
#include<libmnetutil/UDPSocket.h>
-#include<libminisip/soundcard/SoundIO.h>
-#include<libminisip/soundcard/SoundDevice.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/soundcard/SoundIO.h>
+#include<libminisip/media/soundcard/SoundDevice.h>
+#include<libminisip/media/codecs/Codec.h>
-#include<libminisip/mediahandler/CallRecorder.h>
+#include<libminisip/media/CallRecorder.h>
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
Modified: trunk/libminisip/source/subsystem_media/MediaStream.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaStream.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/MediaStream.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -25,19 +25,19 @@
#include <config.h>
-#include<libminisip/mediahandler/MediaStream.h>
+#include<libminisip/media/MediaStream.h>
#include<libmikey/MikeyPayloadSP.h>
#include<libmikey/KeyAgreement.h>
-#include<libminisip/sdp/SdpHeaderM.h>
-#include<libminisip/sdp/SdpHeaderA.h>
-#include<libminisip/sdp/SdpPacket.h>
+#include<libminisip/signaling/sdp/SdpHeaderM.h>
+#include<libminisip/signaling/sdp/SdpHeaderA.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
#include<libmnetutil/UDPSocket.h>
#include<libmutil/stringutils.h>
#include<libmutil/Timestamp.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/RtpReceiver.h>
+#include<libminisip/media/codecs/Codec.h>
#include<libminisip/ipprovider/IpProvider.h>
#include<iostream>
Modified: trunk/libminisip/source/subsystem_media/RtpReceiver.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/RtpReceiver.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/RtpReceiver.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,16 +24,16 @@
#include <config.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
+#include<libminisip/media/RtpReceiver.h>
#include<libmnetutil/UDPSocket.h>
#include<libmnetutil/NetworkException.h>
#include<libmutil/Thread.h>
-#include<libminisip/rtp/SRtpPacket.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/rtp/SRtpPacket.h>
+#include<libminisip/media/codecs/Codec.h>
#include<iostream>
-#include<libminisip/mediahandler/MediaStream.h>
+#include<libminisip/media/MediaStream.h>
#include<libminisip/ipprovider/IpProvider.h>
#include<stdio.h>
Modified: trunk/libminisip/source/subsystem_media/Session.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/Session.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/Session.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -26,23 +26,23 @@
#include <config.h>
-#include<libminisip/mediahandler/Session.h>
+#include<libminisip/media/Session.h>
-#include<libminisip/mediahandler/CallRecorder.h>
-#include<libminisip/mediahandler/MediaStream.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/AudioMedia.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/mediahandler/DtmfSender.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/sdp/SdpPacket.h>
-#include<libminisip/sdp/SdpHeaderV.h>
-#include<libminisip/sdp/SdpHeaderT.h>
-#include<libminisip/sdp/SdpHeaderC.h>
-#include<libminisip/sdp/SdpHeaderA.h>
-#include<libminisip/sdp/SdpHeaderM.h>
-#include<libminisip/sdp/SdpHeaderS.h>
-#include<libminisip/sdp/SdpHeaderO.h>
+#include<libminisip/media/CallRecorder.h>
+#include<libminisip/media/MediaStream.h>
+#include<libminisip/media/Media.h>
+#include<libminisip/media/AudioMedia.h>
+#include<libminisip/media/RtpReceiver.h>
+#include<libminisip/media/DtmfSender.h>
+#include<libminisip/media/codecs/Codec.h>
+#include<libminisip/signaling/sdp/SdpPacket.h>
+#include<libminisip/signaling/sdp/SdpHeaderV.h>
+#include<libminisip/signaling/sdp/SdpHeaderT.h>
+#include<libminisip/signaling/sdp/SdpHeaderC.h>
+#include<libminisip/signaling/sdp/SdpHeaderA.h>
+#include<libminisip/signaling/sdp/SdpHeaderM.h>
+#include<libminisip/signaling/sdp/SdpHeaderS.h>
+#include<libminisip/signaling/sdp/SdpHeaderO.h>
#include<libmikey/KeyAgreement.h>
#include<libmikey/KeyAgreementDH.h>
#include<libmutil/dbg.h>
@@ -50,7 +50,7 @@
#include<libmutil/Timestamp.h>
#ifdef ZRTP_SUPPORT
-#include <libminisip/zrtp/ZrtpHostBridgeMinisip.h>
+#include <libminisip/signaling/zrtp/ZrtpHostBridgeMinisip.h>
#endif
#ifdef _WIN32_WCE
Modified: trunk/libminisip/source/subsystem_media/SessionRegistry.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/SessionRegistry.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/SessionRegistry.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,10 +24,10 @@
#include <config.h>
-#include<libminisip/mediahandler/SessionRegistry.h>
+#include<libminisip/media/SessionRegistry.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/MediaStream.h>
+#include<libminisip/media/Session.h>
+#include<libminisip/media/MediaStream.h>
#ifdef _WIN32_WCE
# include"../include/minisip_wce_extra_includes.h"
Modified: trunk/libminisip/source/subsystem_media/aec/aec.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/aec/aec.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/aec/aec.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -17,7 +17,7 @@
#include <math.h>
#include <string.h>
-#include<libminisip/aec/aec.h>
+#include<libminisip/media/aec/aec.h>
#ifdef _WIN32_WCE
# define M_PI 3.14159265358979323846 /* pi */
Modified: trunk/libminisip/source/subsystem_media/codecs/Codec.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/Codec.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/codecs/Codec.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include<config.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
#include"G711CODEC.h"
using namespace std;
Modified: trunk/libminisip/source/subsystem_media/codecs/G711CODEC.h
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/G711CODEC.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/codecs/G711CODEC.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
enum G711Version {
G711U = 1,
Modified: trunk/libminisip/source/subsystem_media/codecs/GsmCodec.h
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/GsmCodec.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/codecs/GsmCodec.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
typedef struct gsm_state * gsm;
Modified: trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.h
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.h 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/codecs/SPEEXCODEC.h 2007-03-12 23:08:04 UTC (rev 3244)
@@ -27,7 +27,7 @@
#include<libminisip/libminisip_config.h>
-#include<libminisip/codecs/Codec.h>
+#include<libminisip/media/codecs/Codec.h>
#include<speex/speex.h>
Modified: trunk/libminisip/source/subsystem_media/codecs/g711/codec_g711.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/codecs/g711/codec_g711.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/codecs/g711/codec_g711.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -334,7 +334,7 @@
//#include "memory.h"
//#include "audio_types.h"
//#include "codec_types.h"
-//#include<libminisip/codecs/g711/codec_g711.h>
+//#include<libminisip/media/codecs/g711/codec_g711.h>
/*
short mulawtolin[256];
Modified: trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/CryptoContext.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -29,7 +29,7 @@
#include<iostream>
#include<libmutil/massert.h>
-#include<libminisip/rtp/CryptoContext.h>
+#include<libminisip/media/rtp/CryptoContext.h>
#include<libmikey/MikeyPayloadSP.h>
CryptoContext::CryptoContext( uint32_t ssrc ):
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpDebugMonitor.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpDebugMonitor.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpDebugMonitor.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -41,8 +41,8 @@
# include<unistd.h>
#endif
-#include<libminisip/rtp/RtcpDebugMonitor.h>
-#include<libminisip/rtp/RtcpPacket.h>
+#include<libminisip/media/rtp/RtcpDebugMonitor.h>
+#include<libminisip/media/rtp/RtcpPacket.h>
#include<libmutil/Thread.h>
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpPacket.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpPacket.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpPacket.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,8 +24,8 @@
#include <config.h>
-#include<libminisip/rtp/RtcpPacket.h>
-#include<libminisip/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/RtcpPacket.h>
+#include<libminisip/media/rtp/RtcpReport.h>
#ifdef DEBUG_OUTPUT
#include<iostream>
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReport.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,11 +24,11 @@
#include <config.h>
-#include<libminisip/rtp/RtcpReport.h>
-#include<libminisip/rtp/RtcpReportSR.h>
-#include<libminisip/rtp/RtcpReportRR.h>
-#include<libminisip/rtp/RtcpReportSDES.h>
-#include<libminisip/rtp/RtcpReportXR.h>
+#include<libminisip/media/rtp/RtcpReport.h>
+#include<libminisip/media/rtp/RtcpReportSR.h>
+#include<libminisip/media/rtp/RtcpReportRR.h>
+#include<libminisip/media/rtp/RtcpReportSDES.h>
+#include<libminisip/media/rtp/RtcpReportXR.h>
#ifdef DEBUG_OUTPUT
# include<iostream>
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include <config.h>
-#include<libminisip/rtp/RtcpReportRR.h>
+#include<libminisip/media/rtp/RtcpReportRR.h>
#include<config.h>
//#include <netinet/in.h>
#include<iostream>
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportReceptionBlock.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include <config.h>
-#include<libminisip/rtp/RtcpReportReceptionBlock.h>
+#include<libminisip/media/rtp/RtcpReportReceptionBlock.h>
#include<stdlib.h>
#include<iostream>
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportSDES.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportSDES.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportSDES.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include <config.h>
-#include<libminisip/rtp/RtcpReportSDES.h>
+#include<libminisip/media/rtp/RtcpReportSDES.h>
#include<libmutil/massert.h>
#include<iostream>
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx 2007-03-12 22:27:07 UTC (rev 3243)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx 2007-03-12 23:08:04 UTC (rev 3244)
@@ -24,7 +24,7 @@
#include <config.h>
-#include<libminisip/rtp/RtcpReportSR.h>
+#include<libminisip/media/rtp/RtcpReportSR.h&