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

Minor updates and commenting for PhysicalJoystickHandler.

This commit is contained in:
Stephen Anthony 2018-03-18 15:58:41 -02:30
parent 9a4b14392b
commit 3ce71302b7
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/PJoystickHandler.cxx
View File

@ -49,21 +49,6 @@ PhysicalJoystickHandler::PhysicalJoystickHandler(
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PhysicalJoystickHandler::printDatabase() const
{
cerr << "---------------------------------------------------------" << endl
<< "joy database:" << endl;
for(const auto& i: myDatabase)
cerr << i.first << endl << i.second << endl << endl;
cerr << "---------------------" << endl
<< "joy active:" << endl;
for(const auto& i: mySticks)
cerr << i.first << ": " << *i.second << endl;
cerr << "---------------------------------------------------------" << endl << endl << endl;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int PhysicalJoystickHandler::add(PhysicalJoystickPtr stick) int PhysicalJoystickHandler::add(PhysicalJoystickPtr stick)
{ {
@ -721,6 +706,24 @@ VariantList PhysicalJoystickHandler::database() const
return db; return db;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ostream& operator<<(ostream& os, const PhysicalJoystickHandler& jh)
{
os << "---------------------------------------------------------" << endl
<< "joy database:" << endl;
for(const auto& i: jh.myDatabase)
os << i.first << endl << i.second << endl << endl;
os << "---------------------" << endl
<< "joy active:" << endl;
for(const auto& i: jh.mySticks)
os << i.first << ": " << *i.second << endl;
os << "---------------------------------------------------------"
<< endl << endl << endl;
return os;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Used by the Stelladaptor to send absolute axis values // Used by the Stelladaptor to send absolute axis values
const Event::Type PhysicalJoystickHandler::SA_Axis[2][2] = { const Event::Type PhysicalJoystickHandler::SA_Axis[2][2] = {

5
src/common/PJoystickHandler.hxx
View File

@ -96,6 +96,7 @@ class PhysicalJoystickHandler
return j ? j->hatTable[hat][int(value)][mode] : Event::NoType; return j ? j->hatTable[hat][int(value)][mode] : Event::NoType;
} }
/** Returns a list of pairs consisting of joystick name and associated ID. */
VariantList database() const; VariantList database() const;
private: private:
@ -119,8 +120,10 @@ class PhysicalJoystickHandler
return i != mySticks.cend() ? i->second : nullptr; return i != mySticks.cend() ? i->second : nullptr;
} }
// Set default mapping for given joystick when no mappings already exist
void setStickDefaultMapping(int stick, Event::Type type, EventMode mode); void setStickDefaultMapping(int stick, Event::Type type, EventMode mode);
void printDatabase() const;
friend ostream& operator<<(ostream& os, const PhysicalJoystickHandler& jh);
// Static lookup tables for Stelladaptor/2600-daptor axis/button support // Static lookup tables for Stelladaptor/2600-daptor axis/button support
static const Event::Type SA_Axis[2][2]; static const Event::Type SA_Axis[2][2];