diff options
Diffstat (limited to 'src/components/media_manager/src/streamer_adapter.cc')
| -rw-r--r-- | src/components/media_manager/src/streamer_adapter.cc | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc index 7447929f15..808b9715af 100644 --- a/src/components/media_manager/src/streamer_adapter.cc +++ b/src/components/media_manager/src/streamer_adapter.cc @@ -35,7 +35,7 @@ namespace media_manager { -CREATE_LOGGERPTR_GLOBAL(logger, "StreamerAdapter") +SDL_CREATE_LOG_VARIABLE("StreamerAdapter") StreamerAdapter::StreamerAdapter(Streamer* const streamer) : current_application_(0), messages_(), streamer_(streamer), thread_(NULL) { @@ -53,10 +53,9 @@ StreamerAdapter::~StreamerAdapter() { } void StreamerAdapter::StartActivity(int32_t application_key) { - LOG4CXX_AUTO_TRACE(logger); + SDL_LOG_AUTO_TRACE(); if (is_app_performing_activity(application_key)) { - LOG4CXX_WARN(logger, - "Activity for application: " << application_key + SDL_LOG_WARN("Activity for application: " << application_key << " has been already started"); return; } @@ -79,10 +78,9 @@ size_t StreamerAdapter::GetMsgQueueSize() { } void StreamerAdapter::StopActivity(int32_t application_key) { - LOG4CXX_AUTO_TRACE(logger); + SDL_LOG_AUTO_TRACE(); if (!is_app_performing_activity(application_key)) { - LOG4CXX_WARN(logger, - "Activity for application: " << application_key + SDL_LOG_WARN("Activity for application: " << application_key << " has not been started"); return; } @@ -100,10 +98,9 @@ void StreamerAdapter::StopActivity(int32_t application_key) { void StreamerAdapter::SendData(int32_t application_key, const ::protocol_handler::RawMessagePtr msg) { - LOG4CXX_AUTO_TRACE(logger); + SDL_LOG_AUTO_TRACE(); if (!is_app_performing_activity(application_key)) { - LOG4CXX_ERROR(logger, - "Activity for application: " << application_key + SDL_LOG_ERROR("Activity for application: " << application_key << " has not been started"); return; } @@ -123,13 +120,13 @@ StreamerAdapter::Streamer::Streamer(StreamerAdapter* const adapter) StreamerAdapter::Streamer::~Streamer() {} void StreamerAdapter::Streamer::threadMain() { - LOG4CXX_AUTO_TRACE(logger); + SDL_LOG_AUTO_TRACE(); if (!adapter_) { - LOG4CXX_ERROR(logger, "Null pointer to adapter"); + SDL_LOG_ERROR("Null pointer to adapter"); return; } if (!Connect()) { - LOG4CXX_ERROR(logger, "Unable to connect"); + SDL_LOG_ERROR("Unable to connect"); return; } stop_flag_ = false; @@ -138,25 +135,24 @@ void StreamerAdapter::Streamer::threadMain() { while (!adapter_->messages_.empty()) { protocol_handler::RawMessagePtr msg; if (!adapter_->messages_.pop(msg)) { - LOG4CXX_ERROR(logger, "Empty message queue"); + SDL_LOG_ERROR("Empty message queue"); continue; } if (!msg) { - LOG4CXX_ERROR(logger, "Null pointer message"); + SDL_LOG_ERROR("Null pointer message"); continue; } if (!Send(msg)) { - LOG4CXX_ERROR(logger, "Unable to send. Disconnecting"); + SDL_LOG_ERROR("Unable to send. Disconnecting"); Disconnect(); return; } static int32_t messages_for_session = 0; ++messages_for_session; - LOG4CXX_DEBUG(logger, - "Handling map streaming message. This is " - << messages_for_session << " message for " - << adapter_->current_application_); + SDL_LOG_DEBUG("Handling map streaming message. This is " + << messages_for_session << " message for " + << adapter_->current_application_); std::set<MediaListenerPtr>::iterator it = adapter_->media_listeners_.begin(); for (; adapter_->media_listeners_.end() != it; ++it) { @@ -169,7 +165,7 @@ void StreamerAdapter::Streamer::threadMain() { } void StreamerAdapter::Streamer::exitThreadMain() { - LOG4CXX_AUTO_TRACE(logger); + SDL_LOG_AUTO_TRACE(); stop_flag_ = true; if (adapter_) { adapter_->messages_.Shutdown(); |