summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-07-14 23:13:30 +0200
committerGitHub <noreply@github.com>2016-07-14 23:13:30 +0200
commita9d8a7decd510aecbc0492709ecd347e0f7b56de (patch)
tree63cdec11183166eeb2bb5440537965b19dbe1593 /Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
parenta97a546bd667438a98ec2d9c698ab7958280693d (diff)
parent788e19f54d86ba45cdc83d39c0488b17aa1d00dd (diff)
Merge pull request #4009 from leoetlino/common-id-assign
ControllerInterface: Make the ID assigning code common
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index b361fee279..6e93a581d1 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -46,7 +46,6 @@ void Init()
// Search the Pipes directory for files that we can open in read-only,
// non-blocking mode. The device name is the virtual name of the file.
File::FSTEntry fst;
- int found = 0;
std::string dir_path = File::GetUserPath(D_PIPES_IDX);
if (!File::Exists(dir_path))
return;
@@ -61,11 +60,11 @@ void Init()
int fd = open(child.physicalName.c_str(), O_RDONLY | O_NONBLOCK);
if (fd < 0)
continue;
- g_controller_interface.AddDevice(std::make_shared<PipeDevice>(fd, child.virtualName, found++));
+ g_controller_interface.AddDevice(std::make_shared<PipeDevice>(fd, child.virtualName));
}
}
-PipeDevice::PipeDevice(int fd, const std::string& name, int id) : m_fd(fd), m_name(name), m_id(id)
+PipeDevice::PipeDevice(int fd, const std::string& name) : m_fd(fd), m_name(name)
{
for (const auto& tok : s_button_tokens)
{