diff options
Diffstat (limited to 'src/components/media_manager/src/media_manager_impl.cc')
-rw-r--r-- | src/components/media_manager/src/media_manager_impl.cc | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index e8156795b1..d69ff56368 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -1,34 +1,34 @@ -/** -* Copyright (c) 2013, Ford Motor Company -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* -* Redistributions of source code must retain the above copyright notice, this -* list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following -* disclaimer in the documentation and/or other materials provided with the -* distribution. -* -* Neither the name of the Ford Motor Company nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. -*/ +/* + * Copyright (c) 2013, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include "config_profile/profile.h" #include "media_manager/media_manager_impl.h" @@ -133,14 +133,14 @@ void MediaManagerImpl::Init() { } void MediaManagerImpl::PlayA2DPSource(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::PlayA2DPSource"); + LOG4CXX_AUTO_TRACE(logger_); if (a2dp_player_) { a2dp_player_->StartActivity(application_key); } } void MediaManagerImpl::StopA2DPSource(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StopA2DPSource"); + LOG4CXX_AUTO_TRACE(logger_); if (a2dp_player_) { a2dp_player_->StopActivity(application_key); } @@ -200,7 +200,7 @@ void MediaManagerImpl::StartMicrophoneRecording( } void MediaManagerImpl::StopMicrophoneRecording(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StopMicrophoneRecording"); + LOG4CXX_AUTO_TRACE(logger_); #if defined(EXTENDED_MEDIA_MODE) if (from_mic_recorder_) { from_mic_recorder_->StopActivity(application_key); @@ -212,7 +212,7 @@ void MediaManagerImpl::StopMicrophoneRecording(int32_t application_key) { } void MediaManagerImpl::StartVideoStreaming(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StartVideoStreaming"); + LOG4CXX_AUTO_TRACE(logger_); if (video_streamer_) { if (!video_stream_active_) { @@ -224,7 +224,7 @@ void MediaManagerImpl::StartVideoStreaming(int32_t application_key) { } void MediaManagerImpl::StopVideoStreaming(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StopVideoStreaming"); + LOG4CXX_AUTO_TRACE(logger_); if (video_streamer_) { video_stream_active_ = false; application_manager::MessageHelper::SendNaviStopStream(application_key); @@ -233,7 +233,7 @@ void MediaManagerImpl::StopVideoStreaming(int32_t application_key) { } void MediaManagerImpl::StartAudioStreaming(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StartAudioStreaming"); + LOG4CXX_AUTO_TRACE(logger_); if (audio_streamer_) { if (!audio_stream_active_) { @@ -245,7 +245,7 @@ void MediaManagerImpl::StartAudioStreaming(int32_t application_key) { } void MediaManagerImpl::StopAudioStreaming(int32_t application_key) { - LOG4CXX_INFO(logger_, "MediaManagerImpl::StopAudioStreaming"); + LOG4CXX_AUTO_TRACE(logger_); if (audio_streamer_) { audio_stream_active_ = false; application_manager::MessageHelper::SendAudioStopStream(application_key); |