summaryrefslogtreecommitdiff
path: root/src/input_common/gcadapter/gc_poller.h
diff options
context:
space:
mode:
authorAmeer <aj662@drexel.edu>2020-06-21 21:50:58 -0400
committerAmeer <aj662@drexel.edu>2020-06-21 21:50:58 -0400
commit46b4461fbb0514dd50c096ef896b1752d81079d0 (patch)
tree31245dd4ff76724295a20202cea9dba72635f3a0 /src/input_common/gcadapter/gc_poller.h
parent968d631aa59a0a4e51e219eaa143d2b95593c3e7 (diff)
shared_ptr for the GC adapter class, constexpr constants
Diffstat (limited to 'src/input_common/gcadapter/gc_poller.h')
-rw-r--r--src/input_common/gcadapter/gc_poller.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_common/gcadapter/gc_poller.h b/src/input_common/gcadapter/gc_poller.h
index 31ff1c123..d3a56da5b 100644
--- a/src/input_common/gcadapter/gc_poller.h
+++ b/src/input_common/gcadapter/gc_poller.h
@@ -15,7 +15,7 @@ namespace InputCommon {
*/
class GCButtonFactory final : public Input::Factory<Input::ButtonDevice> {
public:
- GCButtonFactory();
+ GCButtonFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
/**
* Creates a button device from a button press
@@ -35,14 +35,14 @@ public:
}
private:
- GCAdapter::Adapter* adapter;
+ std::shared_ptr<GCAdapter::Adapter> adapter;
bool polling = false;
};
/// An analog device factory that creates analog devices from GC Adapter
class GCAnalogFactory final : public Input::Factory<Input::AnalogDevice> {
public:
- GCAnalogFactory();
+ GCAnalogFactory(std::shared_ptr<GCAdapter::Adapter> adapter_);
std::unique_ptr<Input::AnalogDevice> Create(const Common::ParamPackage& params) override;
Common::ParamPackage GetNextInput();
@@ -55,7 +55,7 @@ public:
}
private:
- GCAdapter::Adapter* adapter;
+ std::shared_ptr<GCAdapter::Adapter> adapter;
int analog_x_axis = -1;
int analog_y_axis = -1;
int controller_number = -1;