aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/OVR_Linux_HMDDevice.cpp
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2013-12-29 01:12:14 -0800
committerBrad Davis <[email protected]>2013-12-29 01:12:14 -0800
commit4ec40ed86509d5b8aaf18ac038836873bb45463c (patch)
tree4192974eb3dab2bac8ffdb508a3ec2936c351aaf /LibOVR/Src/OVR_Linux_HMDDevice.cpp
parenta91c41e4b21b61c91df3c86c105a1ab08c6d77c6 (diff)
Updating JSON profile serialization
Diffstat (limited to 'LibOVR/Src/OVR_Linux_HMDDevice.cpp')
-rw-r--r--LibOVR/Src/OVR_Linux_HMDDevice.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/LibOVR/Src/OVR_Linux_HMDDevice.cpp b/LibOVR/Src/OVR_Linux_HMDDevice.cpp
index cce37d5..52f537d 100644
--- a/LibOVR/Src/OVR_Linux_HMDDevice.cpp
+++ b/LibOVR/Src/OVR_Linux_HMDDevice.cpp
@@ -234,14 +234,13 @@ Profile* HMDDeviceCreateDesc::GetProfileAddRef() const
{
// Create device may override profile name, so get it from there is possible.
ProfileManager* profileManager = GetManagerImpl()->GetProfileManager();
- ProfileType profileType = GetProfileType();
const char * profileName = pDevice ?
((HMDDevice*)pDevice)->GetProfileName() :
- profileManager->GetDefaultProfileName(profileType);
+ profileManager->GetDefaultProfileName();
return profileName ?
- profileManager->LoadProfile(profileType, profileName) :
- profileManager->GetDeviceDefaultProfile(profileType);
+ profileManager->LoadProfile(profileName) :
+ profileManager->GetDefaultProfile();
}
@@ -341,7 +340,7 @@ bool HMDDevice::Initialize(DeviceBase* parent)
// Initialize user profile to default for device.
ProfileManager* profileManager = GetManager()->GetProfileManager();
- ProfileName = profileManager->GetDefaultProfileName(getDesc()->GetProfileType());
+ ProfileName = profileManager->GetDefaultProfileName();
return true;
}
@@ -372,7 +371,7 @@ bool HMDDevice::SetProfileName(const char* name)
ProfileName.Clear();
return 0;
}
- if (GetManager()->GetProfileManager()->HasProfile(getDesc()->GetProfileType(), name))
+ if (GetManager()->GetProfileManager()->HasProfile(name))
{
ProfileName = name;
return true;