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

A cleaner fix for the last commit.

This commit is contained in:
Stephen Anthony 2023-08-02 13:25:22 -02:30
parent 7c34bdd27b
commit 2e556fe6b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/PhysicalJoystick.cxx
View File

@ -89,7 +89,7 @@ bool PhysicalJoystick::setMap(const json& map)
continue; continue;
if(entry.key() == "port") if(entry.key() == "port")
{ {
port = getPort(entry.value()); port = getPort(string{entry.value()}); // json doesn't support string_view
continue; continue;
} }
@ -126,7 +126,7 @@ string PhysicalJoystick::getName(const PhysicalJoystick::Port _port) const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalJoystick::Port PhysicalJoystick::getPort(const string& portName) const PhysicalJoystick::Port PhysicalJoystick::getPort(string_view portName) const
{ {
static constexpr std::array<string_view, static constexpr std::array<string_view,
static_cast<int>(PhysicalJoystick::Port::NUM_PORTS)> NAMES = static_cast<int>(PhysicalJoystick::Port::NUM_PORTS)> NAMES =

2
src/common/PhysicalJoystick.hxx
View File

@ -90,7 +90,7 @@ class PhysicalJoystick
// Convert from string to Port type and vice versa // Convert from string to Port type and vice versa
string getName(const Port _port) const; string getName(const Port _port) const;
Port getPort(const string& portName) const; // FIXME: allow string_view Port getPort(string_view portName) const;
friend ostream& operator<<(ostream& os, const PhysicalJoystick& s) { friend ostream& operator<<(ostream& os, const PhysicalJoystick& s) {
os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes