From 77c9b99c7af450d77c14aafbc59491222a20e7b3 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 7 Oct 2016 21:02:35 +0200 Subject: [PATCH] [DEBUG] CORRECT FORMAT INTERFACE] --- audio/drain/IOFormatInterface.cpp | 12 ++++++------ audio/drain/IOFormatInterface.hpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/audio/drain/IOFormatInterface.cpp b/audio/drain/IOFormatInterface.cpp index b2bc32f..7f899f7 100644 --- a/audio/drain/IOFormatInterface.cpp +++ b/audio/drain/IOFormatInterface.cpp @@ -29,7 +29,7 @@ audio::drain::IOFormatInterface::IOFormatInterface() : m_map.push_back(audio::channel_frontRight); } -audio::drain::IOFormatInterface::IOFormatInterface(std::vector _map, audio::format _format, float _frequency) : +audio::drain::IOFormatInterface::IOFormatInterface(std::vector _map, enum audio::format _format, float _frequency) : m_configured(true), m_format(_format), m_map(_map), @@ -37,7 +37,7 @@ audio::drain::IOFormatInterface::IOFormatInterface(std::vector _ } -void audio::drain::IOFormatInterface::set(std::vector _map, audio::format _format, float _frequency) { +void audio::drain::IOFormatInterface::set(std::vector _map, enum audio::format _format, float _frequency) { bool hasChange = false; if (m_map != _map) { m_map = _map; @@ -65,11 +65,11 @@ bool audio::drain::IOFormatInterface::getConfigured() const { return m_configured; } -audio::format audio::drain::IOFormatInterface::getFormat() const { +enum audio::format audio::drain::IOFormatInterface::getFormat() const { return m_format; } -void audio::drain::IOFormatInterface::setFormat(audio::format _value) { +void audio::drain::IOFormatInterface::setFormat(enum audio::format _value) { if (m_format == _value) { return; } @@ -78,11 +78,11 @@ void audio::drain::IOFormatInterface::setFormat(audio::format _value) { configurationChange(); } -const std::vector& audio::drain::IOFormatInterface::getMap() const{ +const std::vector& audio::drain::IOFormatInterface::getMap() const{ return m_map; } -void audio::drain::IOFormatInterface::setMap(const std::vector& _value) { +void audio::drain::IOFormatInterface::setMap(const std::vector& _value) { if (m_map == _value) { return; } diff --git a/audio/drain/IOFormatInterface.hpp b/audio/drain/IOFormatInterface.hpp index 5e2ac35..16a7c1c 100644 --- a/audio/drain/IOFormatInterface.hpp +++ b/audio/drain/IOFormatInterface.hpp @@ -21,39 +21,39 @@ namespace audio { class IOFormatInterface { public: IOFormatInterface(); - IOFormatInterface(std::vector _map, audio::format _format=audio::format_int16, float _frequency=48000.0f); - void set(std::vector _map, audio::format _format=audio::format_int16, float _frequency=48000.0f); + IOFormatInterface(std::vector _map, enum audio::format _format=audio::format_int16, float _frequency=48000.0f); + void set(std::vector _map, enum audio::format _format=audio::format_int16, float _frequency=48000.0f); protected: bool m_configured; public: void setConfigured(bool _value); bool getConfigured() const; protected: - audio::format m_format; //!< input Algo Format + enum audio::format m_format; //!< input Algo Format public: /** * @brief Get the algo format. * @return the current Format. */ - audio::format getFormat() const; + enum audio::format getFormat() const; /** * @brief Set the algo format. * @param[in] _value New Format. */ - void setFormat(audio::format _value); + void setFormat(enum audio::format _value); protected: - std::vector m_map; //!< input channel Map + std::vector m_map; //!< input channel Map public: /** * @brief Get the algo channel Map. * @return the current channel Map. */ - const std::vector& getMap() const; + const std::vector& getMap() const; /** * @brief Set the algo channel Map. * @param[in] _value New channel Map. */ - void setMap(const std::vector& _value); + void setMap(const std::vector& _value); protected: float m_frequency; //!< input Algo Format public: