Rename hk=>smo
This commit is contained in:
@@ -184,7 +184,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
AttachedDevice(const hk::device::SenseDeviceSpec &spec,
|
||||
AttachedDevice(const smo::device::SenseDeviceSpec &spec,
|
||||
std::shared_ptr<XcbConnection> conn)
|
||||
: deviceSpec(spec)
|
||||
// This std::move is moving ownership from a shared_ptr to a shared_ptr
|
||||
@@ -229,14 +229,14 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
hk::device::SenseDeviceSpec deviceSpec;
|
||||
smo::device::SenseDeviceSpec deviceSpec;
|
||||
WindowSelector windowSelector;
|
||||
std::shared_ptr<XcbConnection> connection;
|
||||
std::string actualWindowName;
|
||||
|
||||
public:
|
||||
static int getRequiredParamAsInt(
|
||||
const hk::device::SenseDeviceSpec& spec,
|
||||
const smo::device::SenseDeviceSpec& spec,
|
||||
const std::string& paramName)
|
||||
{
|
||||
auto it = std::find_if(
|
||||
@@ -263,7 +263,7 @@ public:
|
||||
}
|
||||
|
||||
static void parseWindowSelector(
|
||||
const hk::device::SenseDeviceSpec& spec,
|
||||
const smo::device::SenseDeviceSpec& spec,
|
||||
WindowSelector& windowSelector)
|
||||
{
|
||||
// Default match type
|
||||
@@ -428,12 +428,12 @@ static xcb_window_t findByName(
|
||||
|
||||
} // namespace xcb_window_search
|
||||
|
||||
static hk::sense_api::sal_mlo_initializeIndFn xcbXorg_initializeInd;
|
||||
static hk::sense_api::sal_mlo_finalizeIndFn xcbXorg_finalizeInd;
|
||||
static hk::sense_api::sal_mlo_attachDeviceReqFn xcbXorg_attachDeviceReq;
|
||||
static hk::sense_api::sal_mlo_detachDeviceReqFn xcbXorg_detachDeviceReq;
|
||||
static smo::sense_api::sal_mlo_initializeIndFn xcbXorg_initializeInd;
|
||||
static smo::sense_api::sal_mlo_finalizeIndFn xcbXorg_finalizeInd;
|
||||
static smo::sense_api::sal_mlo_attachDeviceReqFn xcbXorg_attachDeviceReq;
|
||||
static smo::sense_api::sal_mlo_detachDeviceReqFn xcbXorg_detachDeviceReq;
|
||||
|
||||
static hk::sense_api::SenseApiDesc xcbXorgApiDesc =
|
||||
static smo::sense_api::SenseApiDesc xcbXorgApiDesc =
|
||||
{
|
||||
.name = "xcb",
|
||||
.exportedImplexorApis = { { "video-implexor" } },
|
||||
@@ -445,7 +445,7 @@ static hk::sense_api::SenseApiDesc xcbXorgApiDesc =
|
||||
}
|
||||
};
|
||||
|
||||
/* Below here are the exported functions that Harikoff will use both to load
|
||||
/* Below here are the exported functions that Salmanoff will use both to load
|
||||
* and use this library.
|
||||
******************************************************************************/
|
||||
|
||||
@@ -459,10 +459,10 @@ static hk::sense_api::SenseApiDesc xcbXorgApiDesc =
|
||||
*
|
||||
* @return A reference to the SenseApiDesc structure describing the API.
|
||||
*/
|
||||
extern HK_UNMANGLED hk::sense_api::HK_GET_SENSE_API_DESC_FN_TYPEDEF
|
||||
HK_GET_SENSE_API_DESC_FN_NAME;
|
||||
extern SMO_UNMANGLED smo::sense_api::SMO_GET_SENSE_API_DESC_FN_TYPEDEF
|
||||
SMO_GET_SENSE_API_DESC_FN_NAME;
|
||||
|
||||
const hk::sense_api::SenseApiDesc &HK_GET_SENSE_API_DESC_FN_NAME(void)
|
||||
const smo::sense_api::SenseApiDesc &SMO_GET_SENSE_API_DESC_FN_NAME(void)
|
||||
{
|
||||
return xcbXorgApiDesc;
|
||||
}
|
||||
@@ -478,7 +478,7 @@ int xcbXorg_finalizeInd(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int xcbXorg_attachDeviceReq(const hk::device::SenseDeviceSpec &desc)
|
||||
int xcbXorg_attachDeviceReq(const smo::device::SenseDeviceSpec &desc)
|
||||
{
|
||||
// Ensure connection exists before creating device. Create conn'tion if not.
|
||||
XcbConnection::XConnectionIdentifier id{
|
||||
@@ -505,7 +505,7 @@ int xcbXorg_attachDeviceReq(const hk::device::SenseDeviceSpec &desc)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int xcbXorg_detachDeviceReq(const hk::device::SenseDeviceSpec &spec)
|
||||
int xcbXorg_detachDeviceReq(const smo::device::SenseDeviceSpec &spec)
|
||||
{
|
||||
auto it = std::find_if(attachedDevices.begin(), attachedDevices.end(),
|
||||
[&spec](const AttachedDevice &device) {
|
||||
|
||||
Reference in New Issue
Block a user