Skip to content

Commit b8ba39e

Browse files
committed
don't use getElements in lookupById
1 parent 7dd90c9 commit b8ba39e

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

include/adm/utilities/lookup.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace adm {
2020
return elements;
2121
}
2222

23-
template <typename Element, typename ElementId, typename ElementRange>
24-
std::shared_ptr<Element> lookupById(const ElementRange& range,
23+
template <typename Element, typename ElementId, typename Elements>
24+
std::shared_ptr<Element> lookupById(const Elements& range,
2525
const ElementId& id) {
2626
for (auto& element : range) {
2727
if (element->template get<ElementId>() == id) {

src/document.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -400,76 +400,76 @@ namespace adm {
400400

401401
// ---- lookup elements ---- //
402402
std::shared_ptr<AudioProgramme> Document::lookup(const AudioProgrammeId& id) {
403-
return lookupById<AudioProgramme>(getElements<AudioProgramme>(), id);
403+
return lookupById<AudioProgramme>(audioProgrammes_, id);
404404
}
405405
std::shared_ptr<const AudioProgramme> Document::lookup(
406406
const AudioProgrammeId& id) const {
407-
return lookupById<const AudioProgramme>(getElements<AudioProgramme>(), id);
407+
return lookupById<const AudioProgramme>(audioProgrammes_, id);
408408
}
409409

410410
std::shared_ptr<AudioContent> Document::lookup(const AudioContentId& id) {
411-
return lookupById<AudioContent>(getElements<AudioContent>(), id);
411+
return lookupById<AudioContent>(audioContents_, id);
412412
}
413413
std::shared_ptr<const AudioContent> Document::lookup(
414414
const AudioContentId& id) const {
415-
return lookupById<const AudioContent>(getElements<AudioContent>(), id);
415+
return lookupById<const AudioContent>(audioContents_, id);
416416
}
417417

418418
std::shared_ptr<AudioObject> Document::lookup(const AudioObjectId& id) {
419-
return lookupById<AudioObject>(getElements<AudioObject>(), id);
419+
return lookupById<AudioObject>(audioObjects_, id);
420420
}
421421
std::shared_ptr<const AudioObject> Document::lookup(
422422
const AudioObjectId& id) const {
423-
return lookupById<const AudioObject>(getElements<AudioObject>(), id);
423+
return lookupById<const AudioObject>(audioObjects_, id);
424424
}
425425

426426
std::shared_ptr<AudioPackFormat> Document::lookup(
427427
const AudioPackFormatId& id) {
428-
return lookupById<AudioPackFormat>(getElements<AudioPackFormat>(), id);
428+
return lookupById<AudioPackFormat>(audioPackFormats_, id);
429429
}
430430
std::shared_ptr<const AudioPackFormat> Document::lookup(
431431
const AudioPackFormatId& id) const {
432-
return lookupById<const AudioPackFormat>(getElements<AudioPackFormat>(),
432+
return lookupById<const AudioPackFormat>(audioPackFormats_,
433433
id);
434434
}
435435

436436
std::shared_ptr<AudioChannelFormat> Document::lookup(
437437
const AudioChannelFormatId& id) {
438-
return lookupById<AudioChannelFormat>(getElements<AudioChannelFormat>(),
438+
return lookupById<AudioChannelFormat>(audioChannelFormats_,
439439
id);
440440
}
441441
std::shared_ptr<const AudioChannelFormat> Document::lookup(
442442
const AudioChannelFormatId& id) const {
443443
return lookupById<const AudioChannelFormat>(
444-
getElements<const AudioChannelFormat>(), id);
444+
audioChannelFormats_, id);
445445
}
446446

447447
std::shared_ptr<AudioStreamFormat> Document::lookup(
448448
const AudioStreamFormatId& id) {
449-
return lookupById<AudioStreamFormat>(getElements<AudioStreamFormat>(), id);
449+
return lookupById<AudioStreamFormat>(audioStreamFormats_, id);
450450
}
451451
std::shared_ptr<const AudioStreamFormat> Document::lookup(
452452
const AudioStreamFormatId& id) const {
453-
return lookupById<const AudioStreamFormat>(getElements<AudioStreamFormat>(),
453+
return lookupById<const AudioStreamFormat>(audioStreamFormats_,
454454
id);
455455
}
456456

457457
std::shared_ptr<AudioTrackFormat> Document::lookup(
458458
const AudioTrackFormatId& id) {
459-
return lookupById<AudioTrackFormat>(getElements<AudioTrackFormat>(), id);
459+
return lookupById<AudioTrackFormat>(audioTrackFormats_, id);
460460
}
461461
std::shared_ptr<const AudioTrackFormat> Document::lookup(
462462
const AudioTrackFormatId& id) const {
463-
return lookupById<const AudioTrackFormat>(getElements<AudioTrackFormat>(),
463+
return lookupById<const AudioTrackFormat>(audioTrackFormats_,
464464
id);
465465
}
466466

467467
std::shared_ptr<AudioTrackUid> Document::lookup(const AudioTrackUidId& id) {
468-
return lookupById<AudioTrackUid>(getElements<AudioTrackUid>(), id);
468+
return lookupById<AudioTrackUid>(audioTrackUids_, id);
469469
}
470470
std::shared_ptr<const AudioTrackUid> Document::lookup(
471471
const AudioTrackUidId& id) const {
472-
return lookupById<const AudioTrackUid>(getElements<AudioTrackUid>(), id);
472+
return lookupById<const AudioTrackUid>(audioTrackUids_, id);
473473
}
474474

475475
template <typename Element>

0 commit comments

Comments
 (0)