1 files changed, 9 insertions, 10 deletions
diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
index a3ef5af0b..a78ca8b49 100644
--- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
+++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013, Ford Motor Company
+// Copyright (c) 2014, Ford Motor Company
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,7 @@
 
 
 #include <string>
+#include <string.h>
 #include "application_manager/application_manager_impl.h"
 #include "application_manager/mobile_command_factory.h"
 #include "application_manager/application_impl.h"
@@ -65,14 +66,14 @@ AudioStreamSenderThread::AudioStreamSenderThread(
     shouldBeStoped_(false),
     shouldBeStoped_lock_(),
     shouldBeStoped_cv_() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
 }
 
 AudioStreamSenderThread::~AudioStreamSenderThread() {
 }
 
 void AudioStreamSenderThread::threadMain() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
 
   offset_ = 0;
 
@@ -82,11 +83,10 @@ void AudioStreamSenderThread::threadMain() {
     sendAudioChunkToMobile();
   }
 
-  LOG4CXX_TRACE_EXIT(logger_);
 }
 
 void AudioStreamSenderThread::sendAudioChunkToMobile() {
-  LOG4CXX_TRACE_ENTER(logger_);
+  LOG4CXX_AUTO_TRACE(logger_);
 
   std::vector<uint8_t> binaryData;
   std::vector<uint8_t>::iterator from;
@@ -112,10 +112,10 @@ void AudioStreamSenderThread::sendAudioChunkToMobile() {
     LOG4CXX_INFO_EXT(logger_, "from != binaryData.end()");
 
     offset_ = offset_ + to - from;
+    std::vector<uint8_t> data(from, to);
 
     application_manager::ApplicationManagerImpl::instance()->
-    SendAudioPassThroughNotification(session_key_,
-                                     std::vector<uint8_t>(from, to));
+    SendAudioPassThroughNotification(session_key_, data);
     binaryData.clear();
   }
 #if !defined(EXTENDED_MEDIA_MODE)
@@ -136,10 +136,9 @@ void AudioStreamSenderThread::setShouldBeStopped(bool should_stop) {
   shouldBeStoped_cv_.NotifyOne();
 }
 
-bool AudioStreamSenderThread::exitThreadMain() {
-  LOG4CXX_INFO(logger_, "AudioStreamSenderThread::exitThreadMain");
+void AudioStreamSenderThread::exitThreadMain() {
+  LOG4CXX_AUTO_TRACE(logger_);
   setShouldBeStopped(true);
-  return true;
 }
 
 uint32_t AudioStreamSenderThread::session_key() const {