diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz | |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp')
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 9067339..1fb3ddf 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -883,10 +883,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertyExec(std::queue<std::string>& Cm error = true; am_MainSoundProperty_s soundProperty; - if (tmpType < MSP_MAX) - soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType); - else - error = true; + soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType); if (!(istream_value >> soundProperty.value)) error = true; @@ -1147,10 +1144,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertiesExec(std::queue<std::string>& error = true; am_MainSoundProperty_s soundProperty; - if (tmpType < MSP_MAX) - soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType); - else - error = true; + soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType); if (!(istream_value >> soundProperty.value)) error = true; @@ -1207,10 +1201,7 @@ void CAmTelnetMenuHelper::setSinkSoundPropertyExec(std::queue<std::string>& CmdQ error = true; am_MainSoundProperty_s soundProperty; - if (tmpType < MSP_MAX) - soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType); - else - error = true; + soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType); if (!(istream_value >> soundProperty.value)) error = true; |