From 81c0fe40ddbf41cd5b01f3afc9fd3c43df6febe6 Mon Sep 17 00:00:00 2001
From: philippegorley <gorley.philippe@gmail.com>
Date: Wed, 12 Sep 2018 13:41:54 -0400
Subject: [PATCH] audio: remove ring::audio namespace
It is only used by the AudioInput, move it to the same namespace as
other audio related classes.
Change-Id: Icc92fbb2021a24a9d65bb904d2e790609414bd77
---
src/media/audio/audio_input.cpp | 4 ++--
src/media/audio/audio_input.h | 4 ++--
src/media/localrecorder.cpp | 2 +-
src/media/localrecorder.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/media/audio/audio_input.cpp b/src/media/audio/audio_input.cpp
index 295f1a9502..8aba3472e6 100644
--- a/src/media/audio/audio_input.cpp
+++ b/src/media/audio/audio_input.cpp
@@ -27,7 +27,7 @@
#include "manager.h"
#include "smartools.h"
-namespace ring { namespace audio {
+namespace ring {
AudioInput::AudioInput(const std::string& id) :
id_(id),
@@ -121,4 +121,4 @@ AudioInput::initRecorder(const std::shared_ptr<MediaRecorder>& rec)
recorder_ = rec;
}
-}} // namespace ring::audio
+} // namespace ring
diff --git a/src/media/audio/audio_input.h b/src/media/audio/audio_input.h
index 040d68e9ce..abc3647adf 100644
--- a/src/media/audio/audio_input.h
+++ b/src/media/audio/audio_input.h
@@ -29,7 +29,7 @@ namespace ring {
class MediaRecorder;
}
-namespace ring { namespace audio {
+namespace ring {
class AudioInput
{
@@ -57,4 +57,4 @@ private:
void cleanup();
};
-}} // namespace ring::audio
+} // namespace ring
diff --git a/src/media/localrecorder.cpp b/src/media/localrecorder.cpp
index 1e93a7ac33..345fb9ed25 100644
--- a/src/media/localrecorder.cpp
+++ b/src/media/localrecorder.cpp
@@ -74,7 +74,7 @@ LocalRecorder::startRecording()
ring::Manager::instance().startAudioDriverStream();
// TODO wait for AudioLayer::hardwareFormatAvailable callback, otherwise a race condition happens here
- audioInput_.reset(new ring::audio::AudioInput(RingBufferPool::DEFAULT_ID));
+ audioInput_.reset(new ring::AudioInput(RingBufferPool::DEFAULT_ID));
audioInput_->initRecorder(recorder_);
#ifdef RING_VIDEO
diff --git a/src/media/localrecorder.h b/src/media/localrecorder.h
index 92a5e63564..81be4e9733 100644
--- a/src/media/localrecorder.h
+++ b/src/media/localrecorder.h
@@ -63,7 +63,7 @@ class LocalRecorder : public Recordable {
private:
bool videoInputSet_ = false;
std::weak_ptr<ring::video::VideoInput> videoInput_;
- std::unique_ptr<ring::audio::AudioInput> audioInput_ = nullptr;
+ std::unique_ptr<ring::AudioInput> audioInput_ = nullptr;
std::string path_;
};
--
GitLab