diff options
Diffstat (limited to 'src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc')
-rw-r--r-- | src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc index 5599743bd3..d2634214fa 100644 --- a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc +++ b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc @@ -39,7 +39,7 @@ namespace media_manager { -CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") +SDL_CREATE_LOG_VARIABLE("MediaManager") GMainLoop* FromMicToFileRecorderThread::loop = NULL; @@ -61,13 +61,13 @@ FromMicToFileRecorderThread::FromMicToFileRecorderThread( , outputFileName_(output_file) , samplingRate_(sampling_rate) , bitsPerSample_(bits_per_sample) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); set_record_duration(duration); // audio_type is not used as we always employ LPCM } FromMicToFileRecorderThread::~FromMicToFileRecorderThread() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (sleepThread_) { sleepThread_->Stop(threads::Thread::kThreadSoftStop); delete sleepThread_->GetDelegate(); @@ -77,12 +77,12 @@ FromMicToFileRecorderThread::~FromMicToFileRecorderThread() { void FromMicToFileRecorderThread::set_output_file( const std::string& output_file) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); outputFileName_ = output_file; } void FromMicToFileRecorderThread::set_record_duration(int32_t duration) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); std::stringstream stringStream; stringStream << duration / 1000; @@ -90,7 +90,7 @@ void FromMicToFileRecorderThread::set_record_duration(int32_t duration) { } void FromMicToFileRecorderThread::initArgs() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); argv_ = new gchar*[argc_]; @@ -108,7 +108,7 @@ void FromMicToFileRecorderThread::initArgs() { } void FromMicToFileRecorderThread::deinitArgs() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (argv_) { for (int32_t i = 0; i < argc_; i++) { @@ -120,7 +120,7 @@ void FromMicToFileRecorderThread::deinitArgs() { } void FromMicToFileRecorderThread::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); { sync_primitives::AutoLock auto_lock(stopFlagLock_); @@ -186,9 +186,9 @@ void FromMicToFileRecorderThread::threadMain() { g_error("Must supply destination (-d FILE)\n"); } - LOG4CXX_TRACE(logger_, "Reading from device: " << device); - LOG4CXX_TRACE(logger_, "Saving pipeline output to: " << outfile); - LOG4CXX_TRACE(logger_, "Duration set to: " << duration); + SDL_LOG_TRACE("Reading from device: " << device); + SDL_LOG_TRACE("Saving pipeline output to: " << outfile); + SDL_LOG_TRACE("Duration set to: " << duration); // Initialize gstreamer and setup the main loop information gst_init(&argc, &argv); @@ -216,7 +216,7 @@ void FromMicToFileRecorderThread::threadMain() { // Create a capability to specify audio format. It also downmixes the recorded // audio to monaural. std::string caps_string = create_caps_string(); - LOG4CXX_DEBUG(logger_, "Using audio caps: " << caps_string); + SDL_LOG_DEBUG("Using audio caps: " << caps_string); audiocaps = gst_caps_from_string(caps_string.c_str()); // Assert that all the elements were created @@ -248,7 +248,7 @@ void FromMicToFileRecorderThread::threadMain() { gst_element_set_state(pipeline, GST_STATE_PLAYING); - LOG4CXX_TRACE(logger_, "Initializing pipeline ..."); + SDL_LOG_TRACE("Initializing pipeline ..."); while (GST_STATE(pipeline) != GST_STATE_PLAYING) { bool shouldBeStoped; { @@ -266,7 +266,7 @@ void FromMicToFileRecorderThread::threadMain() { return; } } - LOG4CXX_TRACE(logger_, "Pipeline started ...\n"); + SDL_LOG_TRACE("Pipeline started ...\n"); // Start up a timer for the pipeline if (duration > 0) { @@ -285,7 +285,7 @@ void FromMicToFileRecorderThread::threadMain() { gst_element_set_state(pipeline, GST_STATE_NULL); - LOG4CXX_TRACE(logger_, "Deleting pipeline\n"); + SDL_LOG_TRACE("Deleting pipeline\n"); gst_object_unref(GST_OBJECT(pipeline)); g_main_loop_unref(loop); g_option_context_free(context); @@ -296,7 +296,7 @@ void FromMicToFileRecorderThread::threadMain() { } std::string FromMicToFileRecorderThread::create_caps_string() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); std::stringstream ss; ss << "audio/x-raw"; @@ -343,7 +343,7 @@ FromMicToFileRecorderThread::SleepThreadDelegate::SleepThreadDelegate( : threads::ThreadDelegate(), timeout_(timeout) {} void FromMicToFileRecorderThread::SleepThreadDelegate::threadMain() { - LOG4CXX_TRACE(logger_, "Sleep for " << timeout_.duration << " seconds"); + SDL_LOG_TRACE("Sleep for " << timeout_.duration << " seconds"); sleep(timeout_.duration); @@ -355,21 +355,21 @@ void FromMicToFileRecorderThread::SleepThreadDelegate::threadMain() { } void FromMicToFileRecorderThread::exitThreadMain() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (NULL != loop) { if (g_main_loop_is_running(loop)) { - LOG4CXX_TRACE(logger_, "Quit loop\n"); + SDL_LOG_TRACE("Quit loop\n"); g_main_loop_quit(loop); } } if (sleepThread_) { - LOG4CXX_DEBUG(logger_, "Stop sleep thread\n"); + SDL_LOG_DEBUG("Stop sleep thread\n"); sleepThread_->stop(); } - LOG4CXX_TRACE(logger_, "Set should be stopped flag\n"); + SDL_LOG_TRACE("Set should be stopped flag\n"); sync_primitives::AutoLock auto_lock(stopFlagLock_); shouldBeStoped_ = true; } |