Commit 81c0fe40 authored by Philippe Gorley's avatar Philippe Gorley

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
parent 2210b540
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "manager.h" #include "manager.h"
#include "smartools.h" #include "smartools.h"
namespace ring { namespace audio { namespace ring {
AudioInput::AudioInput(const std::string& id) : AudioInput::AudioInput(const std::string& id) :
id_(id), id_(id),
...@@ -121,4 +121,4 @@ AudioInput::initRecorder(const std::shared_ptr<MediaRecorder>& rec) ...@@ -121,4 +121,4 @@ AudioInput::initRecorder(const std::shared_ptr<MediaRecorder>& rec)
recorder_ = rec; recorder_ = rec;
} }
}} // namespace ring::audio } // namespace ring
...@@ -29,7 +29,7 @@ namespace ring { ...@@ -29,7 +29,7 @@ namespace ring {
class MediaRecorder; class MediaRecorder;
} }
namespace ring { namespace audio { namespace ring {
class AudioInput class AudioInput
{ {
...@@ -57,4 +57,4 @@ private: ...@@ -57,4 +57,4 @@ private:
void cleanup(); void cleanup();
}; };
}} // namespace ring::audio } // namespace ring
...@@ -74,7 +74,7 @@ LocalRecorder::startRecording() ...@@ -74,7 +74,7 @@ LocalRecorder::startRecording()
ring::Manager::instance().startAudioDriverStream(); ring::Manager::instance().startAudioDriverStream();
// TODO wait for AudioLayer::hardwareFormatAvailable callback, otherwise a race condition happens here // 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_); audioInput_->initRecorder(recorder_);
#ifdef RING_VIDEO #ifdef RING_VIDEO
......
...@@ -63,7 +63,7 @@ class LocalRecorder : public Recordable { ...@@ -63,7 +63,7 @@ class LocalRecorder : public Recordable {
private: private:
bool videoInputSet_ = false; bool videoInputSet_ = false;
std::weak_ptr<ring::video::VideoInput> videoInput_; 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_; std::string path_;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment