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
@@ -91,11 +91,11 @@ Database::AvmCnrConfig toDb(const ModifyCnrConfigRequest &config)
|
||||
result.radioCircuit = QString::fromStdString(config.radioCircuit());
|
||||
result.callSign = QString::fromStdString(config.callSign());
|
||||
result.partyId = config.partyId();
|
||||
if (config.unitId().is_set())
|
||||
result.unitId = config.unitId().get();
|
||||
if (config.unitId.is_set())
|
||||
result.unitId = config.unitId.get();
|
||||
result.recording = config.recording();
|
||||
if (config.exerciseId().is_set())
|
||||
result.exerciseId = config.exerciseId().get();
|
||||
if (config.exerciseId.is_set())
|
||||
result.exerciseId = config.exerciseId.get();
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -490,21 +490,21 @@ bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &
|
||||
// or when both exercises are currently active.
|
||||
// If one is global and one local the constraint must always hold if the local exercise is active
|
||||
// Otherwise 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;
|
||||
}
|
||||
else if(config.exerciseId().is_set() && !exerciseId.is_initialized())
|
||||
else if(config.exerciseId.is_set() && !exerciseId.is_initialized())
|
||||
{
|
||||
if(!isActiveExercise(config.exerciseId().get()))
|
||||
if(!isActiveExercise(config.exerciseId.get()))
|
||||
continue;
|
||||
}
|
||||
else if(exerciseId.is_initialized() && !config.exerciseId().is_set())
|
||||
else if(exerciseId.is_initialized() && !config.exerciseId.is_set())
|
||||
{
|
||||
if(!isActiveExercise(*exerciseId))
|
||||
continue;
|
||||
@@ -662,10 +662,10 @@ bool CnrHandler::isActiveExercise(int exerciseId) const
|
||||
bool CnrHandler::needDeviceConfig(const CnrConfig &config) const
|
||||
{
|
||||
// For global, we always need the config
|
||||
if (!config.exerciseId().is_set())
|
||||
if (!config.exerciseId.is_set())
|
||||
return true;
|
||||
|
||||
int32_t exerciseId = config.exerciseId().get();
|
||||
int32_t exerciseId = config.exerciseId.get();
|
||||
// Not for inactive exercises
|
||||
if (!isActiveExercise(exerciseId))
|
||||
return false;
|
||||
@@ -702,8 +702,8 @@ bool CnrHandler::haveActiveFrequencyPlanning() const
|
||||
QString CnrHandler::exerciseList(const CnrConfig &config) const
|
||||
{
|
||||
// Local
|
||||
if (config.exerciseId().is_set())
|
||||
return ExerciseContext(config.exerciseId().get()).toString();
|
||||
if (config.exerciseId.is_set())
|
||||
return ExerciseContext(config.exerciseId.get()).toString();
|
||||
|
||||
// Global - all active exercises, no matter if they have active plannings or not
|
||||
QStringList exerciseList;
|
||||
|
||||
Reference in new issue
Block a user