diff options
| author | JackLivio <jack@livio.io> | 2017-10-04 10:13:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 10:13:04 -0400 |
| commit | 0c236291a2e678197abe77cb0fa824c6ae6b0904 (patch) | |
| tree | 4860e465e99faf6e1f9868b29c4a03a1ad21583b | |
| parent | 41d3029c1698e5b12a529a44fd2c0bae8f66202d (diff) | |
| parent | 0ae7df52480d16e6ea93f42d41fc99e3fe330cf9 (diff) | |
| download | sdl_core-0c236291a2e678197abe77cb0fa824c6ae6b0904.tar.gz | |
Merge pull request #1804 from smartdevicelink/develop
Merge Develop Fixes
| -rw-r--r-- | src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc | 11 | ||||
| -rw-r--r-- | src/components/media_manager/test/media_manager_impl_test.cc | 2 |
2 files changed, 8 insertions, 5 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 cfb1784788..99548e71bd 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 @@ -32,6 +32,7 @@ #include "media_manager/audio/from_mic_to_file_recorder_thread.h" #include <unistd.h> +#include <cstring> #include <sstream> #include "utils/logger.h" @@ -88,11 +89,11 @@ void FromMicToFileRecorderThread::initArgs() { argv_[3] = new gchar[3]; argv_[4] = new gchar[durationString_.length() + 1]; - argv_[0] = const_cast<gchar*>(std::string("AudioManager").c_str()); - argv_[1] = const_cast<gchar*>(oKey_.c_str()); - argv_[2] = const_cast<gchar*>(outputFileName_.c_str()); - argv_[3] = const_cast<gchar*>(tKey_.c_str()); - argv_[4] = const_cast<gchar*>(durationString_.c_str()); + std::strcpy(argv_[0], "AudioManager"); + std::strcpy(argv_[1], oKey_.c_str()); + std::strcpy(argv_[2], outputFileName_.c_str()); + std::strcpy(argv_[3], tKey_.c_str()); + std::strcpy(argv_[4], durationString_.c_str()); } void FromMicToFileRecorderThread::deinitArgs() { diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc index 7d0226fa67..a9dc27d7a3 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -123,10 +123,12 @@ class MediaManagerImplTest : public ::testing::Test { .WillOnce(Return(mock_app_)); EXPECT_CALL(mock_media_manager_settings_, app_storage_folder()) .WillOnce(ReturnRef(kStorageFolder)); +#ifndef EXTENDED_MEDIA_MODE EXPECT_CALL(mock_media_manager_settings_, app_resource_folder()) .WillOnce(ReturnRef(kResourceFolder)); EXPECT_CALL(mock_media_manager_settings_, recording_file_source()) .WillOnce(ReturnRef(kRecordingFileSource)); +#endif } void InitMediaManagerPrecondition(const std::string& server_type) { |