- cleanup CMakeLists.txt

src/CMakeLists.txt

@@ -62,7 +62,7 @@ if (CMAKE_SYSTEM MATCHES "Android")
 
     message("Adding the Oboe library")
     set (OBOE_DIR libs/oboe)
-    add_subdirectory (${OBOE_DIR} ./oboe)
+    add_subdirectory (${OBOE_DIR} build_oboe)
     include_directories (${OBOE_DIR}/include)
     set (DEFINES ${DEFINES} -DTARGET_ANDROID -DHAVE_NETINET_IN_H)
     set (TARGET_ANDROID ON)

src/engine/agent/Agent_AudioManager.cpp

@@ -12,7 +12,7 @@
 # include "../engine/audio/Audio_Android.h"
 #endif
 
-#define LOG_SUBSYSTEM "AudioManager"
+#define LOG_SUBSYSTEM "audio"
 
 
 AudioManager::AudioManager()

src/engine/agent/Agent_Impl.cpp

@@ -18,7 +18,7 @@ const std::string Status_NoMediaAction = "no valid media action";
 const std::string Status_NoCommand = "no valid command";
 const std::string Status_NoAudioManager = "no audio manager";
 
-#define LOG_SUBSYSTEM "Agent"
+#define LOG_SUBSYSTEM "agent"
 
 AgentImpl::AgentImpl()
     :mShutdown(false), mEventListChangeCondVar()

src/engine/audio/Audio_AndroidOboe.cpp

@@ -10,7 +10,7 @@
 
 #ifdef TARGET_ANDROID
 
-#define LOG_SUBSYSTEM "Audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 

src/engine/audio/Audio_CoreAudio.cpp

@@ -13,7 +13,7 @@
 
 using namespace Audio;
 
-#define LOG_SUBSYSTEM "CoreAudio"
+#define LOG_SUBSYSTEM "audio"
 
 enum
 {

src/engine/audio/Audio_DevicePair.cpp

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "Audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 

src/engine/audio/Audio_DirectSound.cpp

@@ -22,7 +22,7 @@
 #define DRV_QUERYFUNCTIONINSTANCEID  (DRV_RESERVED + 17)
 #define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18)
 
-#define LOG_SUBSYSTEM "DirectSound"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 

src/engine/audio/Audio_Mixer.cpp

@@ -12,7 +12,7 @@
 
 #include "Audio_Mixer.h"
 
-#define LOG_SUBSYSTEM "Mixer"
+#define LOG_SUBSYSTEM "audio"
 using namespace Audio;
 
 Mixer::Stream::Stream()

src/engine/audio/Audio_Null.cpp

@@ -2,7 +2,7 @@
 #include "helper/HL_Log.h"
 #include <assert.h>
 #include <chrono>
-#define LOG_SUBSYSTEM "NULL audio"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 

src/engine/audio/Audio_Player.cpp

@@ -7,7 +7,7 @@
 
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "Player"
+#define LOG_SUBSYSTEM "audio"
 
 using namespace Audio;
 // -------------- Player -----------

src/engine/audio/Audio_WavFile.cpp

@@ -32,7 +32,7 @@ WaveFormatEx;
 
 #define WAVE_FORMAT_PCM 1
 
-#define LOG_SUBSYSTEM "WavFileReader"
+#define LOG_SUBSYSTEM "audio"
 
 #define LOCK std::unique_lock<std::recursive_mutex> lock(mFileMtx);
 

src/engine/endpoint/EP_Account.cpp

@@ -10,7 +10,7 @@
 #include <resip/stack/Pidf.hxx>
 #include <resip/stack/PlainContents.hxx>
 
-#define LOG_SUBSYSTEM "Account"
+#define LOG_SUBSYSTEM "engine"
 
 #define CONFIG(X) mConfig->at(X)
 #define CONFIG_EXISTS(X) mConfig->exists(X)

src/engine/endpoint/EP_AudioProvider.cpp

@@ -14,7 +14,7 @@
 #include "../helper/HL_Log.h"
 #include "../helper/HL_String.h"
 
-#define LOG_SUBSYSTEM "AudioProvider"
+#define LOG_SUBSYSTEM "engine"
 
 AudioProvider::AudioProvider(UserAgent& agent, MT::Terminal& terminal)
     :mUserAgent(agent), mTerminal(terminal), mState(0),

src/engine/endpoint/EP_Engine.cpp

@@ -37,7 +37,7 @@
 # include "resip/stack/ssl/WinSecurity.hxx"
 #endif
 
-#define LOG_SUBSYSTEM "[Engine]"
+#define LOG_SUBSYSTEM "engine"
 #define LOCK Lock l(mGuard)
 #define CAST2RESIPSESSION(x) (x.isValid() ? (x->getAppDialogSet().isValid() ? dynamic_cast<ResipSession*>(x->getAppDialogSet().get()) : NULL) : NULL)
 

src/engine/endpoint/EP_Session.cpp

@@ -11,7 +11,7 @@
 #include "../helper/HL_Sync.h"
 #include "../helper/HL_String.h"
 
-#define LOG_SUBSYSTEM "[Engine]"
+#define LOG_SUBSYSTEM "engine"
 
 typedef resip::SdpContents::Session::Medium Medium;
 typedef resip::SdpContents::Session::MediumContainer MediumContainer;

src/engine/helper/HL_Rtp.cpp

@@ -25,7 +25,7 @@
 #include <cstdio>
 #include <chrono>
 
-#define LOG_SUBSYSTEM "RtpDump"
+#define LOG_SUBSYSTEM "network"
 
 static constexpr size_t MAX_RTP_PACKET_SIZE = 65535;
 static const char RTPDUMP_SHEBANG[] = "#!rtpplay1.0";

src/engine/helper/HL_SocketHeap.cpp

@@ -20,7 +20,7 @@
 #include "HL_Sync.h"
 #include "HL_Exception.h"
 
-#define LOG_SUBSYSTEM "[SocketHeap]"
+#define LOG_SUBSYSTEM "network"
 
 #ifndef WIN32
 #define WSAGetLastError(X) errno

src/engine/media/MT_AmrCodec.cpp

@@ -6,7 +6,7 @@
 #include "../helper/HL_IuUP.h"
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "AmrCodec"
+#define LOG_SUBSYSTEM "media"
 using namespace MT;
 
 

src/engine/media/MT_AudioCodec.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <algorithm>
 
-#define LOG_SUBSYSTEM "Codec"
+#define LOG_SUBSYSTEM "media"
 
 #ifdef TARGET_LINUX
 # define stricmp strcasecmp

src/engine/media/MT_AudioReceiver.cpp

@@ -21,9 +21,7 @@
 
 #include <algorithm>
 
-#define LOG_SUBSYSTEM "AudioReceiver"
+#define LOG_SUBSYSTEM "media"
-
-//#define DUMP_DECODED
 
 using namespace MT;
 
@@ -564,7 +562,7 @@ void AudioReceiver::produceCNG(std::chrono::milliseconds length, Audio::DataWind
 
 AudioReceiver::DecodeResult AudioReceiver::decodeGapTo(Audio::DataWindow& output, DecodeOptions options)
 {
-    ICELogDebug(<< "Gap detected.");
+    ICELogMedia(<< "Gap detected.");
 
     mDecodedLength = mResampledLength = 0;
     if (mCngPacket && mCodec)

src/engine/media/MT_AudioStream.cpp

@@ -16,7 +16,7 @@
 #include "jrtplib/src/rtptransmitter.h"
 #include "jrtplib/src/rtpsessionparams.h"
 
-#define LOG_SUBSYSTEM "AudioStream"
+#define LOG_SUBSYSTEM "media"
 
 //#define DUMP_SENDING_AUDIO
 

src/engine/media/MT_Box.cpp

@@ -12,7 +12,7 @@
 #include "../helper/HL_StreamState.h"
 #include "../helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "MT::Box"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 

src/engine/media/MT_NativeRtpSender.cpp

@@ -7,7 +7,7 @@
 #include "ICELog.h"
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "MT"
+#define LOG_SUBSYSTEM "media"
 using namespace MT;
 
 NativeRtpSender::NativeRtpSender(Statistics& stat)

src/engine/media/MT_SingleAudioStream.cpp

@@ -8,7 +8,7 @@
 //#include "resip/stack/SdpContents.hxx"
 #include "../engine/helper/HL_Log.h"
 
-#define LOG_SUBSYSTEM "SingleAudioStream"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 

src/engine/media/MT_Statistics.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 
 #include "MT_Statistics.h"
-#define LOG_SUBSYSTEM "Statistics"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 

src/engine/media/MT_Stream.cpp

@@ -8,7 +8,7 @@
 #include "../helper/HL_Log.h"
 #include <math.h>
 
-#define LOG_SUBSYSTEM "[Media]"
+#define LOG_SUBSYSTEM "media"
 
 using namespace MT;
 

src/libs/ice/ICEAuthTransaction.cpp

@@ -10,7 +10,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 AuthTransaction::AuthTransaction()
 :Transaction(), mActive(false), mComposed(false), mConformsToKeepaliveSchedule(true),

src/libs/ice/ICEBinding.cpp

@@ -10,7 +10,7 @@
 #include <memory>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 //----------------------- AuthClientBinding -----------------
 

src/libs/ice/ICEBoxImpl.cpp

@@ -8,7 +8,7 @@
 
 #include <assert.h>
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 

src/libs/ice/ICECandidate.cpp

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 

src/libs/ice/ICECandidatePair.cpp

@@ -11,7 +11,7 @@
 #include <stdio.h>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 CandidatePair::CandidatePair()
 :mPriority(0), mState(CandidatePair::Frozen), mControlledIndex(0), mControllingIndex(1),
 mNomination(Nomination_None), mRole(Regular), mTransaction(NULL)

src/libs/ice/ICECheckList.cpp

@@ -13,7 +13,7 @@
 #include <sstream>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* CheckList::stateToString(int state)
 {

src/libs/ice/ICELog.cpp

@@ -349,8 +349,6 @@ void Logger::beginLine(LogLevel level, const char* filename, int linenumber, con
 void
 Logger::endLine()
 {
-    *mStream << std::endl;
-    *mStream << std::flush;
     mStream->flush();
 
     std::ostringstream result;
@@ -382,7 +380,7 @@ Logger::endLine()
     }
     if (mFile)
     {
-        fprintf(mFile, "%s", result.str().c_str());
+        fprintf(mFile, "%s\n", result.str().c_str());
         fflush(mFile);
     }
     if (mDelegate)

src/libs/ice/ICENetworkHelper.cpp

@@ -38,7 +38,7 @@
 #include "ICEError.h"
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 #if defined(TARGET_WIN) && !defined(WINDOWS_RT)
 class IPHlpApi

src/libs/ice/ICERelaying.cpp

@@ -14,7 +14,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 // ------------------ ClientAllocate -----------------
 
 ClientAllocate::ClientAllocate(unsigned int lifetime)

src/libs/ice/ICESession.cpp

@@ -28,7 +28,7 @@
 using namespace ice;
 
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 
 Session::Session()

src/libs/ice/ICEStream.cpp

@@ -18,7 +18,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* ice::RunningStateToString(RunningState state)
 {

src/libs/ice/ICEStunMessage.cpp

@@ -24,7 +24,7 @@
 
 #define STUN_HEADER_SIZE 20
 #define HMAC_DIGEST_SIZE 20
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 using namespace ice;
 

src/libs/ice/ICEStunTransaction.cpp

@@ -17,7 +17,7 @@
 #include <assert.h>
 
 using namespace ice;
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 const char* Transaction::stateToString(State state)
 {

src/libs/ice/ICETransactionList.cpp

@@ -9,7 +9,7 @@
 
 using namespace ice;
 
-#define LOG_SUBSYSTEM "ICE"
+#define LOG_SUBSYSTEM "ice"
 
 TransactionList::TransactionList()
 :mRegularIndex(0), mPrioritizedIndex(0)