Changeset 3306 for code/branches/core4/src/core/input/JoyStick.h

Timestamp:

Jul 19, 2009, 1:13:43 AM (15 years ago)

Author:

rgrieder

Message:

Keybindings should now map to the correct joy stick by device name (like "WingMan Action Pad" or so).

File:

• code/branches/core4/src/core/input/JoyStick.h (modified) (3 diffs)

code/branches/core4/src/core/input/JoyStick.h

@@ -71 +71 @@
         void setConfigValues();
 
-        //! Returns the ID string generated from the number of knobs and the device name
-        const std::string& getIDString() const { return this->idString_; }
+        //! Returns the name generated from the number of knobs and the device name
+        const std::string& getDeviceName() const { return this->deviceName_; }
 
     private:
@@ -106 +106 @@
         static std::string getClassNameImpl() { return "JoyStick"; }
 
-        std::string idString_;                //!< ID string generated by the number of knobs and the device name
+        std::string deviceName_;              //!< Name generated by the number of knobs and the device name
         int povStates_[4];                    //!< Internal states for the POVs
         int sliderStates_[4][2];              //!< Internal states for the Sliders (each slider has X and Y!)
@@ -122 +122 @@
         std::string calibrationFilename_;     //!< Joy stick calibration ini filename
 
-        //! Contains a list of all ID strings to avoid duplicates
-        static std::vector<std::string> idStrings_s;
+        //! Contains a list of all names to avoid duplicates
+        static std::vector<std::string> deviceNames_s;
 
         //!< Maximum number of slider axes