#include <map>
#include "protocol_handler/raw_message.h"
#include "media_manager/media_adapter_impl.h"
-#include "utils/logger.h"
namespace threads {
class Thread;
class A2DPSourcePlayerThread;
std::map<int32_t, threads::Thread*> sources_;
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter);
};
#define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_AUDIO_STREAM_SENDER_THREAD_H_
#include <string>
-#include "utils/logger.h"
#include "utils/macro.h"
#include "utils/threads/thread_delegate.h"
#include "utils/lock.h"
sync_primitives::Lock shouldBeStoped_lock_;
static const int32_t kAudioPassThruTimeout;
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread);
};
#include <string>
#include "media_manager/media_adapter_impl.h"
-#include "utils/logger.h"
namespace threads {
class Thread;
std::string output_file_;
int32_t duration_;
const int32_t kDefaultDuration;
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter);
};
} // namespace media_manager
threads::Thread* reader_;
std::string file_name_;
int32_t current_application_;
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener);
};
} // namespace media_manager
void set_record_duration(int32_t duration);
private:
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
int32_t argc_;
gchar** argv_;
#include "media_manager/media_adapter.h"
#include "media_manager/media_adapter_listener.h"
#include "utils/macro.h"
-#include "utils/logger.h"
namespace media_manager {
int32_t current_application_;
private:
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl);
};
} // namespace media_manager
bool audio_stream_active_;
private:
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(MediaManagerImpl);
-
FRIEND_BASE_SINGLETON_CLASS(MediaManagerImpl);
};
#include <stdint.h>
#include "media_manager/media_adapter_listener.h"
#include "utils/macro.h"
-#include "utils/logger.h"
namespace media_manager {
class StreamerListener : public MediaAdapterListener {
virtual void OnActivityEnded(int32_t application_key);
private:
int32_t current_application_;
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
DISALLOW_COPY_AND_ASSIGN(StreamerListener);
};
} // namespace media_manager
#include "media_manager/audio/a2dp_source_player_adapter.h"
#include "utils/lock.h"
#include "utils/threads/thread_delegate.h"
+#include "utils/logger.h"
#include "connection_handler/connection_handler_impl.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr A2DPSourcePlayerAdapter::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("A2DPSourcePlayerAdapter"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "A2DPSourcePlayerAdapter")
class A2DPSourcePlayerAdapter::A2DPSourcePlayerThread
: public threads::ThreadDelegate {
bool exitThreadMain();
private:
-#ifdef ENABLE_LOG
- static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
// The Sample format to use
static const pa_sample_spec sSampleFormat_;
return (application_key == current_application_);
}
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr A2DPSourcePlayerAdapter::A2DPSourcePlayerThread::logger_ =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("A2DPSourcePlayerThread"));
-#endif // ENABLE_LOG
-
const pa_sample_spec A2DPSourcePlayerAdapter::A2DPSourcePlayerThread::
sSampleFormat_ = {
/*format*/ PA_SAMPLE_S16LE,
#include "smart_objects/smart_object.h"
#include "interfaces/MOBILE_API.h"
#include "utils/file_system.h"
+#include "utils/logger.h"
#include "media_manager/audio/audio_stream_sender_thread.h"
#include "application_manager/smart_object_keys.h"
using sync_primitives::AutoLock;
const int32_t AudioStreamSenderThread::kAudioPassThruTimeout = 1;
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr AudioStreamSenderThread::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("AudioPassThruThread"));
-#endif // ENABLE_LOG
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "AudioPassThruThread")
AudioStreamSenderThread::AudioStreamSenderThread(
const std::string fileName, uint32_t session_key)
#include <string>
#include "utils/threads/thread.h"
+#include "utils/logger.h"
#include "media_manager/audio/from_mic_to_file_recorder_thread.h"
#include "media_manager/audio/from_mic_recorder_adapter.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicRecorderAdapter::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("FromMicRecorderAdapter"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicRecorderAdapter")
FromMicRecorderAdapter::FromMicRecorderAdapter()
: recorder_thread_(NULL)
*/
#include "utils/threads/thread.h"
+#include "utils/logger.h"
#include "media_manager/audio/from_mic_recorder_listener.h"
#include "media_manager/audio/audio_stream_sender_thread.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicRecorderListener::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("FromMicRecorderListener"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicRecorderListener")
FromMicRecorderListener::FromMicRecorderListener(
const std::string& file_name)
-/**
-* 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
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <unistd.h>
-
#include "media_manager/audio/from_mic_to_file_recorder_thread.h"
+#include <unistd.h>
+#include <sstream>
+#include "utils/logger.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicToFileRecorderThread::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("FromMicToFileRecorderThread"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicToFileRecorderThread")
GMainLoop* FromMicToFileRecorderThread::loop = NULL;
#include "media_manager/audio/pipe_audio_streamer_adapter.h"
#include "config_profile/profile.h"
+#include "utils/logger.h"
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeAudioStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeAudioStreamerAdapter")
PipeAudioStreamerAdapter::PipeAudioStreamerAdapter() {
LOG4CXX_INFO(logger, "PipeAudioStreamerAdapter::PipeAudioStreamerAdapter");
#include "config_profile/profile.h"
#include "media_manager/audio/socket_audio_streamer_adapter.h"
+#include "utils/logger.h"
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketAudioStreamerAdapter"));
-}
-
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketAudioStreamerAdapter")
SocketAudioStreamerAdapter::SocketAudioStreamerAdapter() {
LOG4CXX_INFO(logger, "SocketAudioStreamerAdapter::SocketAudioStreamerAdapter");
SocketAudioStreamerAdapter::~SocketAudioStreamerAdapter() {
}
-
} // namespace media_manager
*/
#include "media_manager/media_adapter_impl.h"
+#include "utils/logger.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr MediaAdapterImpl::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("MediaAdapterImpl"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "MediaAdapterImpl")
MediaAdapterImpl::MediaAdapterImpl()
: current_application_(0) {
#include "application_manager/application_manager_impl.h"
#include "application_manager/application_impl.h"
#include "utils/file_system.h"
+#include "utils/logger.h"
#if defined(EXTENDED_MEDIA_MODE)
#include "media_manager/audio/a2dp_source_player_adapter.h"
#include "media_manager/audio/from_mic_recorder_adapter.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr MediaManagerImpl::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("MediaManagerImpl"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManagerImpl")
MediaManagerImpl::MediaManagerImpl()
: protocol_handler_(NULL)
application(application_key);
std::string file_path = profile::Profile::instance()->app_storage_folder();
file_path += "/";
- file_path += app->name();
+ file_path += app->folder_name();
file_system::CreateDirectory(file_path);
file_path += "/";
}
}
const std::string predefined_rec_file =
- profile::Profile::instance()->app_storage_folder() + "/audio.8bit.wav";
+ profile::Profile::instance()->app_resourse_folder() + "/" +
+ profile::Profile::instance()->recording_file();
std::vector<uint8_t> buf;
if (file_system::ReadBinaryFile(predefined_rec_file, buf)) {
if (file_system::Write(file_path, buf)) {
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <errno.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeStreamerAdapter")
PipeStreamerAdapter::PipeStreamerAdapter()
: is_ready_(false),
#include <string.h>
#include "config_profile/profile.h"
#include "media_manager/video/socket_video_streamer_adapter.h"
+#include "utils/logger.h"
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketStreamerAdapter")
SocketStreamerAdapter::SocketStreamerAdapter()
: socket_fd_(0),
#include "media_manager/streamer_listener.h"
#include "media_manager/media_manager_impl.h"
+#include "utils/logger.h"
namespace media_manager {
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr StreamerListener::logger_ = log4cxx::LoggerPtr(
- log4cxx::Logger::getLogger("StreamerListener"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "StreamerListener")
StreamerListener::StreamerListener()
: current_application_(0) {
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeVideoStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeVideoStreamerAdapter")
PipeVideoStreamerAdapter::PipeVideoStreamerAdapter() {
LOG4CXX_INFO(logger, "PipeVideoStreamerAdapter::PipeVideoStreamerAdapter");
#include "config_profile/profile.h"
#include "media_manager/video/socket_video_streamer_adapter.h"
+#include "utils/logger.h"
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketVideoStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketVideoStreamerAdapter")
SocketVideoStreamerAdapter::SocketVideoStreamerAdapter() {
LOG4CXX_INFO(logger, "SocketVideoStreamerAdapter::SocketVideoStreamerAdapter");
#include "media_manager/video/video_stream_to_file_adapter.h"
#include "utils/file_system.h"
+#include "utils/logger.h"
namespace media_manager {
-namespace {
-log4cxx::LoggerPtr logger =
- log4cxx::LoggerPtr(log4cxx::Logger::getLogger("VideoStreamToFileAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "VideoStreamToFileAdapter")
VideoStreamToFileAdapter::VideoStreamToFileAdapter(const std::string& file_name)
: file_name_(file_name),