[Sofaswitch-svn] [commit] r410 - in sofaswitch/trunk: am mcu server sound voip

Author: derek Date: Tue May 13 00:51:52 2008 New Revision: 410 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/am/audio.h sofaswitch/trunk/am/comms.cxx sofaswitch/trunk/am/comms.h sofaswitch/trunk/am/counts.cxx sofaswitch/trunk/am/counts.h sofaswitch/trunk/am/main.cxx sofaswitch/trunk/am/main.h sofaswitch/trunk/am/manager.cxx sofaswitch/trunk/am/manager.h sofaswitch/trunk/am/supervisor.cxx sofaswitch/trunk/am/supervisor.h sofaswitch/trunk/am/version.h sofaswitch/trunk/mcu/audio.cxx sofaswitch/trunk/mcu/audio.h sofaswitch/trunk/mcu/comms.cxx sofaswitch/trunk/mcu/comms.h sofaswitch/trunk/mcu/conferenceroom.cxx sofaswitch/trunk/mcu/conferenceroom.h sofaswitch/trunk/mcu/counts.cxx sofaswitch/trunk/mcu/counts.h sofaswitch/trunk/mcu/main.cxx sofaswitch/trunk/mcu/main.h sofaswitch/trunk/mcu/manager.cxx sofaswitch/trunk/mcu/manager.h sofaswitch/trunk/mcu/member.cxx sofaswitch/trunk/mcu/member.h sofaswitch/trunk/mcu/participant.cxx sofaswitch/trunk/mcu/participant.h sofaswitch/trunk/mcu/supervisor.cxx sofaswitch/trunk/mcu/supervisor.h sofaswitch/trunk/mcu/version.h sofaswitch/trunk/server/counts.cxx sofaswitch/trunk/server/counts.h sofaswitch/trunk/server/main.cxx sofaswitch/trunk/server/main.h sofaswitch/trunk/server/version.h sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/comms.cxx sofaswitch/trunk/sound/comms.h sofaswitch/trunk/sound/main.cxx sofaswitch/trunk/sound/main.h sofaswitch/trunk/sound/version.h sofaswitch/trunk/voip/comms.cxx sofaswitch/trunk/voip/comms.h sofaswitch/trunk/voip/counts.cxx sofaswitch/trunk/voip/counts.h sofaswitch/trunk/voip/jocall.cxx sofaswitch/trunk/voip/jocall.h sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/main.h sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/supervisor.cxx sofaswitch/trunk/voip/supervisor.h sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpconnection.h sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpep.h sofaswitch/trunk/voip/udpsound.cxx sofaswitch/trunk/voip/udpsound.h sofaswitch/trunk/voip/version.h Log: tidy up emacs strings at end of the files soas to make Emacs editing consistant. Work on the building of new comms identities for voip.. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Tue May 13 00:51:52 2008 @@ -333,5 +333,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/am/audio.h ============================================================================== --- sofaswitch/trunk/am/audio.h (original) +++ sofaswitch/trunk/am/audio.h Tue May 13 00:51:52 2008 @@ -174,5 +174,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _AUDIO_MAIN_H Modified: sofaswitch/trunk/am/comms.cxx ============================================================================== --- sofaswitch/trunk/am/comms.cxx (original) +++ sofaswitch/trunk/am/comms.cxx Tue May 13 00:51:52 2008 @@ -327,3 +327,13 @@ } } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/am/comms.h ============================================================================== --- sofaswitch/trunk/am/comms.h (original) +++ sofaswitch/trunk/am/comms.h Tue May 13 00:51:52 2008 @@ -271,4 +271,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/counts.cxx ============================================================================== --- sofaswitch/trunk/am/counts.cxx (original) +++ sofaswitch/trunk/am/counts.cxx Tue May 13 00:51:52 2008 @@ -86,4 +86,14 @@ void IncCountCommsConsumers() { ++countNewCommsConsumers; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/counts.h ============================================================================== --- sofaswitch/trunk/am/counts.h (original) +++ sofaswitch/trunk/am/counts.h Tue May 13 00:51:52 2008 @@ -61,4 +61,14 @@ #endif // _COUNTS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/main.cxx ============================================================================== --- sofaswitch/trunk/am/main.cxx (original) +++ sofaswitch/trunk/am/main.cxx Tue May 13 00:51:52 2008 @@ -148,4 +148,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/main.h ============================================================================== --- sofaswitch/trunk/am/main.h (original) +++ sofaswitch/trunk/am/main.h Tue May 13 00:51:52 2008 @@ -69,4 +69,14 @@ #endif // _Am_MAIN_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/manager.cxx ============================================================================== --- sofaswitch/trunk/am/manager.cxx (original) +++ sofaswitch/trunk/am/manager.cxx Tue May 13 00:51:52 2008 @@ -210,4 +210,14 @@ return result; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/manager.h ============================================================================== --- sofaswitch/trunk/am/manager.h (original) +++ sofaswitch/trunk/am/manager.h Tue May 13 00:51:52 2008 @@ -198,4 +198,14 @@ #endif // _SsAm_MANAGER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/supervisor.cxx ============================================================================== --- sofaswitch/trunk/am/supervisor.cxx (original) +++ sofaswitch/trunk/am/supervisor.cxx Tue May 13 00:51:52 2008 @@ -134,4 +134,17 @@ sleep(2); AmProcess::Current().GetManager()->EndEverything(); } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + + + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/supervisor.h ============================================================================== --- sofaswitch/trunk/am/supervisor.h (original) +++ sofaswitch/trunk/am/supervisor.h Tue May 13 00:51:52 2008 @@ -121,5 +121,15 @@ #endif // _SUPERVISOR_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/am/version.h ============================================================================== --- sofaswitch/trunk/am/version.h (original) +++ sofaswitch/trunk/am/version.h Tue May 13 00:51:52 2008 @@ -37,5 +37,15 @@ #endif // _SsAm_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/audio.cxx ============================================================================== --- sofaswitch/trunk/mcu/audio.cxx (original) +++ sofaswitch/trunk/mcu/audio.cxx Tue May 13 00:51:52 2008 @@ -189,5 +189,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/mcu/audio.h ============================================================================== --- sofaswitch/trunk/mcu/audio.h (original) +++ sofaswitch/trunk/mcu/audio.h Tue May 13 00:51:52 2008 @@ -126,6 +126,16 @@ }; +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _Mcu_AUDIO_MAIN_H Modified: sofaswitch/trunk/mcu/comms.cxx ============================================================================== --- sofaswitch/trunk/mcu/comms.cxx (original) +++ sofaswitch/trunk/mcu/comms.cxx Tue May 13 00:51:52 2008 @@ -292,5 +292,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/comms.h ============================================================================== --- sofaswitch/trunk/mcu/comms.h (original) +++ sofaswitch/trunk/mcu/comms.h Tue May 13 00:51:52 2008 @@ -230,5 +230,15 @@ #endif // _Mcu_COMMS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/conferenceroom.cxx ============================================================================== --- sofaswitch/trunk/mcu/conferenceroom.cxx (original) +++ sofaswitch/trunk/mcu/conferenceroom.cxx Tue May 13 00:51:52 2008 @@ -148,6 +148,16 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// // End of conferenceroom.cxx Modified: sofaswitch/trunk/mcu/conferenceroom.h ============================================================================== --- sofaswitch/trunk/mcu/conferenceroom.h (original) +++ sofaswitch/trunk/mcu/conferenceroom.h Tue May 13 00:51:52 2008 @@ -152,5 +152,15 @@ #endif // _Mcu_CONFERENCE_ROOM_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/counts.cxx ============================================================================== --- sofaswitch/trunk/mcu/counts.cxx (original) +++ sofaswitch/trunk/mcu/counts.cxx Tue May 13 00:51:52 2008 @@ -109,5 +109,15 @@ void IncCountParticipants() { ++countNewParticipants; } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/counts.h ============================================================================== --- sofaswitch/trunk/mcu/counts.h (original) +++ sofaswitch/trunk/mcu/counts.h Tue May 13 00:51:52 2008 @@ -71,5 +71,15 @@ #endif // _COUNTS_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/main.cxx ============================================================================== --- sofaswitch/trunk/mcu/main.cxx (original) +++ sofaswitch/trunk/mcu/main.cxx Tue May 13 00:51:52 2008 @@ -152,5 +152,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/main.h ============================================================================== --- sofaswitch/trunk/mcu/main.h (original) +++ sofaswitch/trunk/mcu/main.h Tue May 13 00:51:52 2008 @@ -71,4 +71,14 @@ #endif // _Mcu_MAIN_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/manager.cxx ============================================================================== --- sofaswitch/trunk/mcu/manager.cxx (original) +++ sofaswitch/trunk/mcu/manager.cxx Tue May 13 00:51:52 2008 @@ -350,5 +350,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/manager.h ============================================================================== --- sofaswitch/trunk/mcu/manager.h (original) +++ sofaswitch/trunk/mcu/manager.h Tue May 13 00:51:52 2008 @@ -252,4 +252,14 @@ #endif // _Mcu_MANAGER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/member.cxx ============================================================================== --- sofaswitch/trunk/mcu/member.cxx (original) +++ sofaswitch/trunk/mcu/member.cxx Tue May 13 00:51:52 2008 @@ -399,5 +399,15 @@ PTRACE(3, "Append Done " << *this); } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + //////////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/member.h ============================================================================== --- sofaswitch/trunk/mcu/member.h (original) +++ sofaswitch/trunk/mcu/member.h Tue May 13 00:51:52 2008 @@ -292,4 +292,14 @@ #endif // _Mcu_MEMBER_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/participant.cxx ============================================================================== --- sofaswitch/trunk/mcu/participant.cxx (original) +++ sofaswitch/trunk/mcu/participant.cxx Tue May 13 00:51:52 2008 @@ -270,3 +270,14 @@ RemoveAt(partKey); } } + + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/mcu/participant.h ============================================================================== --- sofaswitch/trunk/mcu/participant.h (original) +++ sofaswitch/trunk/mcu/participant.h Tue May 13 00:51:52 2008 @@ -330,4 +330,14 @@ #endif // _Mcu_Participant_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/supervisor.cxx ============================================================================== --- sofaswitch/trunk/mcu/supervisor.cxx (original) +++ sofaswitch/trunk/mcu/supervisor.cxx Tue May 13 00:51:52 2008 @@ -122,4 +122,16 @@ sleep(2); McuProcess::Current().GetManager()->EndEverything(); } + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/supervisor.h ============================================================================== --- sofaswitch/trunk/mcu/supervisor.h (original) +++ sofaswitch/trunk/mcu/supervisor.h Tue May 13 00:51:52 2008 @@ -121,4 +121,14 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/mcu/version.h ============================================================================== --- sofaswitch/trunk/mcu/version.h (original) +++ sofaswitch/trunk/mcu/version.h Tue May 13 00:51:52 2008 @@ -34,5 +34,15 @@ #endif // _Mcu_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/server/counts.cxx ============================================================================== --- sofaswitch/trunk/server/counts.cxx (original) +++ sofaswitch/trunk/server/counts.cxx Tue May 13 00:51:52 2008 @@ -103,5 +103,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/server/counts.h ============================================================================== --- sofaswitch/trunk/server/counts.h (original) +++ sofaswitch/trunk/server/counts.h Tue May 13 00:51:52 2008 @@ -65,6 +65,16 @@ PString GetCountReceivedSentDropped(); +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _COUNTS_H Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Tue May 13 00:51:52 2008 @@ -951,3 +951,13 @@ // End of main.cxx + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/server/main.h ============================================================================== --- sofaswitch/trunk/server/main.h (original) +++ sofaswitch/trunk/server/main.h Tue May 13 00:51:52 2008 @@ -446,3 +446,13 @@ ///////////////////////////////////////////////////////////////////////////// #endif // _MAIN_H + +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ Modified: sofaswitch/trunk/server/version.h ============================================================================== --- sofaswitch/trunk/server/version.h (original) +++ sofaswitch/trunk/server/version.h Tue May 13 00:51:52 2008 @@ -41,5 +41,15 @@ #endif // _Server_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Tue May 13 00:51:52 2008 @@ -211,5 +211,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of audio.cxx Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Tue May 13 00:51:52 2008 @@ -153,5 +153,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _AUDIO_MAIN_H Modified: sofaswitch/trunk/sound/comms.cxx ============================================================================== --- sofaswitch/trunk/sound/comms.cxx (original) +++ sofaswitch/trunk/sound/comms.cxx Tue May 13 00:51:52 2008 @@ -195,5 +195,15 @@ } +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/comms.h ============================================================================== --- sofaswitch/trunk/sound/comms.h (original) +++ sofaswitch/trunk/sound/comms.h Tue May 13 00:51:52 2008 @@ -163,5 +163,15 @@ #endif +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/main.cxx ============================================================================== --- sofaswitch/trunk/sound/main.cxx (original) +++ sofaswitch/trunk/sound/main.cxx Tue May 13 00:51:52 2008 @@ -354,5 +354,15 @@ //////////////////////////////////////////////////////////////////////////////// +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of main.cxx Modified: sofaswitch/trunk/sound/main.h ============================================================================== --- sofaswitch/trunk/sound/main.h (original) +++ sofaswitch/trunk/sound/main.h Tue May 13 00:51:52 2008 @@ -103,5 +103,15 @@ +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + #endif // _MAIN_H Modified: sofaswitch/trunk/sound/version.h ============================================================================== --- sofaswitch/trunk/sound/version.h (original) +++ sofaswitch/trunk/sound/version.h Tue May 13 00:51:52 2008 @@ -44,5 +44,15 @@ #endif // _Audio_VERSION_H +/* The comment below is magic for those who use emacs to edit this file. */ +/* With the comment below, the tab key does auto indent to 2 spaces. */ + +/* + * Local Variables: + * mode:c + * c-basic-offset:4 + * End: + */ + // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Tue May 13 00:51:52 2008 @@ -259,6 +259,11 @@ mf->Resume(); mf->WaitUntilInitialised(); PTRACE(3, "Built message frame " << *mf); + + if (mf->IsTerminated()) { + delete mf; + mf = NULL; + } return mf; } @@ -278,12 +283,15 @@ PTRACE(3, "GetNextComms from CommsProvider"); for(;;) { Comms *c = (Comms *)GetTheNextMessageFrame(); + if (c == NULL) + return NULL; if (c->IsTerminated()) { delete c; - c = NULL; + } else { + return c; } - return c; } + return NULL; } @@ -326,8 +334,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/comms.h ============================================================================== --- sofaswitch/trunk/voip/comms.h (original) +++ sofaswitch/trunk/voip/comms.h Tue May 13 00:51:52 2008 @@ -251,8 +251,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/counts.cxx ============================================================================== --- sofaswitch/trunk/voip/counts.cxx (original) +++ sofaswitch/trunk/voip/counts.cxx Tue May 13 00:51:52 2008 @@ -140,8 +140,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/counts.h ============================================================================== --- sofaswitch/trunk/voip/counts.h (original) +++ sofaswitch/trunk/voip/counts.h Tue May 13 00:51:52 2008 @@ -83,8 +83,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/jocall.cxx ============================================================================== --- sofaswitch/trunk/voip/jocall.cxx (original) +++ sofaswitch/trunk/voip/jocall.cxx Tue May 13 00:51:52 2008 @@ -247,8 +247,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/jocall.h ============================================================================== --- sofaswitch/trunk/voip/jocall.h (original) +++ sofaswitch/trunk/voip/jocall.h Tue May 13 00:51:52 2008 @@ -217,8 +217,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Tue May 13 00:51:52 2008 @@ -296,8 +296,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/main.h ============================================================================== --- sofaswitch/trunk/voip/main.h (original) +++ sofaswitch/trunk/voip/main.h Tue May 13 00:51:52 2008 @@ -83,8 +83,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue May 13 00:51:52 2008 @@ -926,8 +926,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Tue May 13 00:51:52 2008 @@ -290,8 +290,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/supervisor.cxx ============================================================================== --- sofaswitch/trunk/voip/supervisor.cxx (original) +++ sofaswitch/trunk/voip/supervisor.cxx Tue May 13 00:51:52 2008 @@ -140,8 +140,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/supervisor.h ============================================================================== --- sofaswitch/trunk/voip/supervisor.h (original) +++ sofaswitch/trunk/voip/supervisor.h Tue May 13 00:51:52 2008 @@ -125,8 +125,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Tue May 13 00:51:52 2008 @@ -315,8 +315,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpconnection.h ============================================================================== --- sofaswitch/trunk/voip/udpconnection.h (original) +++ sofaswitch/trunk/voip/udpconnection.h Tue May 13 00:51:52 2008 @@ -221,8 +221,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Tue May 13 00:51:52 2008 @@ -191,8 +191,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpep.h ============================================================================== --- sofaswitch/trunk/voip/udpep.h (original) +++ sofaswitch/trunk/voip/udpep.h Tue May 13 00:51:52 2008 @@ -216,8 +216,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpsound.cxx ============================================================================== --- sofaswitch/trunk/voip/udpsound.cxx (original) +++ sofaswitch/trunk/voip/udpsound.cxx Tue May 13 00:51:52 2008 @@ -288,8 +288,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/udpsound.h ============================================================================== --- sofaswitch/trunk/voip/udpsound.h (original) +++ sofaswitch/trunk/voip/udpsound.h Tue May 13 00:51:52 2008 @@ -257,8 +257,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */ Modified: sofaswitch/trunk/voip/version.h ============================================================================== --- sofaswitch/trunk/voip/version.h (original) +++ sofaswitch/trunk/voip/version.h Tue May 13 00:51:52 2008 @@ -52,8 +52,7 @@ /* * Local Variables: * mode:c - * c-file-style:linux - * c-basic-offset:2 + * c-basic-offset:4 * End: */