ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3231 from spxtr/Pipes 

Fix some bugs in Pipe input parsing
This commit is contained in:
Scott Mansell 2015-11-05 20:31:03 +13:00
parent 4826376f8c 4faf958fee
commit 290466d57a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
View File

@ -111,15 +111,13 @@ void PipeDevice::UpdateInput()
bytes_read = read(m_fd, buf, sizeof buf); bytes_read = read(m_fd, buf, sizeof buf);
} }
std::size_t newline = m_buf.find("\n"); std::size_t newline = m_buf.find("\n");
std::size_t erase_until = 0;
while (newline != std::string::npos) while (newline != std::string::npos)
{ {
std::string command = m_buf.substr(0, newline); std::string command = m_buf.substr(0, newline);
ParseCommand(command); ParseCommand(command);
erase_until = newline + 1; m_buf.erase(0, newline + 1);
newline = m_buf.find("\n", erase_until); newline = m_buf.find("\n");
} }
m_buf.erase(0, erase_until);
} }
void PipeDevice::AddAxis(const std::string& name, double value) void PipeDevice::AddAxis(const std::string& name, double value)
@ -166,7 +164,7 @@ void PipeDevice::ParseCommand(const std::string& command)
double value = strtod(tokens[2].c_str(), nullptr); double value = strtod(tokens[2].c_str(), nullptr);
SetAxis(tokens[1], (value / 2.0) + 0.5); SetAxis(tokens[1], (value / 2.0) + 0.5);
} }
else else if (tokens.size() == 4)
{ {
double x = strtod(tokens[2].c_str(), nullptr); double x = strtod(tokens[2].c_str(), nullptr);
double y = strtod(tokens[3].c_str(), nullptr); double y = strtod(tokens[3].c_str(), nullptr);