Migrates AudioVideoManagement to generated rtiddsgen API
Converts accessor calls to plain member access across avm service and plugin.
This commit is contained in:
29 files changed
+308
-295
No files matched your search
@@ -66,8 +66,8 @@ Database::AvmTvcConfig toDb(const ModifyTvcConfigRequest &request)
|
||||
result.info = QString::fromStdString(request.info());
|
||||
result.recording = request.recording();
|
||||
result.tetraChannelId = request.tetraChannelId();
|
||||
if (request.exerciseId().is_set())
|
||||
result.exerciseId = request.exerciseId().get();
|
||||
if (request.exerciseId.is_set())
|
||||
result.exerciseId = request.exerciseId.get();
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -426,7 +426,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context)
|
||||
|
||||
for (const TvcConfig &tvcConfig : qAsConst(m_cache))
|
||||
{
|
||||
bool isLocal = tvcConfig.exerciseId().is_set();
|
||||
bool isLocal = tvcConfig.exerciseId.is_set();
|
||||
if (isLocal)
|
||||
{
|
||||
if (tvcConfig.exerciseId() == context.id())
|
||||
@@ -448,7 +448,7 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context)
|
||||
|
||||
for (const TvcConfig &tvcConfig : qAsConst(m_cache))
|
||||
{
|
||||
bool isLocal = tvcConfig.exerciseId().is_set();
|
||||
bool isLocal = tvcConfig.exerciseId.is_set();
|
||||
|
||||
if (isLocal)
|
||||
{
|
||||
@@ -534,11 +534,11 @@ bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &
|
||||
// If both configs are local the constraint must hold if they are in the same exercise
|
||||
// or when both exercises are currently active.
|
||||
// Otherwise (one or both are global) the constraint must always hold
|
||||
bool bothLocal = config.exerciseId().is_set() && exerciseId.is_initialized();
|
||||
bool bothLocal = config.exerciseId.is_set() && exerciseId.is_initialized();
|
||||
if (bothLocal)
|
||||
{
|
||||
bool sameExercise = config.exerciseId().get() == *exerciseId;
|
||||
bool bothActive = isActiveExercise(config.exerciseId().get()) && isActiveExercise(*exerciseId);
|
||||
bool sameExercise = config.exerciseId.get() == *exerciseId;
|
||||
bool bothActive = isActiveExercise(config.exerciseId.get()) && isActiveExercise(*exerciseId);
|
||||
if (!sameExercise && !bothActive)
|
||||
continue;
|
||||
}
|
||||
@@ -556,9 +556,9 @@ bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &
|
||||
*/
|
||||
QString TvcHandler::exerciseList(const TvcConfig &config) const
|
||||
{
|
||||
bool isLocal = config.exerciseId().is_set();
|
||||
bool isLocal = config.exerciseId.is_set();
|
||||
if (isLocal)
|
||||
return ExerciseContext(config.exerciseId().get()).toString();
|
||||
return ExerciseContext(config.exerciseId.get()).toString();
|
||||
|
||||
// for global config
|
||||
QString exerciseList;
|
||||
@@ -574,9 +574,9 @@ QString TvcHandler::exerciseList(const TvcConfig &config) const
|
||||
|
||||
bool TvcHandler::needDeviceConfig(const TvcConfig &config) const
|
||||
{
|
||||
bool isGlobal = !config.exerciseId().is_set();
|
||||
bool isGlobal = !config.exerciseId.is_set();
|
||||
bool hasActiveExericse = m_activeExercises->count() > 0;
|
||||
return (isGlobal && hasActiveExericse) || (!isGlobal && isActiveExercise(config.exerciseId().get()));
|
||||
return (isGlobal && hasActiveExericse) || (!isGlobal && isActiveExercise(config.exerciseId.get()));
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user