Skip to content

Commit c32d97b

Browse files
markreidvfxmarkreidvfx
committed
cleanup
1 parent 63567c6 commit c32d97b

File tree

3 files changed

+12
-34
lines changed

3 files changed

+12
-34
lines changed

‎aaf/iterator.pxd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ cdef class MobSlotIter(BaseIterator):
6060

6161
cdef class MobIter(BaseIterator):
6262
cdef lib.IEnumAAFMobs *ptr
63-
cdef lib.aafSearchCrit_t search_crit
6463

6564
cdef class OperationDefIter(BaseIterator):
6665
pass

‎aaf/iterator.pyx‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ cdef class BaseIterator(object):
1717
return item
1818
raise IndexError("index out of range")
1919

20-
def reset(self):
21-
pass
22-
2320
def __iter__(self):
2421
if self._clone_iter:
2522
return self._clone_iter()
@@ -43,7 +40,6 @@ cdef class ClassDefIter(BaseIterator):
4340
self.ptr.Release()
4441

4542
def reset(self):
46-
super(ClassDefIter, self).reset()
4743
error_check(self.ptr.Reset())
4844

4945
def clone(self):
@@ -71,7 +67,6 @@ cdef class CodecDefIter(BaseIterator):
7167
self.ptr.Release()
7268

7369
def reset(self):
74-
super(CodecDefIter, self).reset()
7570
error_check(self.ptr.Reset())
7671

7772
def clone(self):
@@ -99,7 +94,6 @@ cdef class ComponentIter(BaseIterator):
9994
self.ptr.Release()
10095

10196
def reset(self):
102-
super(ComponentIter, self).reset()
10397
error_check(self.ptr.Reset())
10498

10599
def clone(self):
@@ -127,7 +121,6 @@ cdef class ControlPointIter(BaseIterator):
127121
self.ptr.Release()
128122

129123
def reset(self):
130-
super(ControlPointIter, self).reset()
131124
error_check(self.ptr.Reset())
132125

133126
def clone(self):
@@ -155,7 +148,6 @@ cdef class EssenceDataIter(BaseIterator):
155148
self.ptr.Release()
156149

157150
def reset(self):
158-
super(EssenceDataIter, self).reset()
159151
error_check(self.ptr.Reset())
160152

161153
def clone(self):
@@ -183,7 +175,6 @@ cdef class KLVDataDefIter(BaseIterator):
183175
self.ptr.Release()
184176

185177
def reset(self):
186-
super(KLVDataDefIter, self).reset()
187178
error_check(self.ptr.Reset())
188179

189180
def clone(self):
@@ -211,7 +202,6 @@ cdef class LoadedPluginIter(BaseIterator):
211202
self.ptr.Release()
212203

213204
def reset(self):
214-
super(LoadedPluginIter, self).reset()
215205
error_check(self.ptr.Reset())
216206

217207
def clone(self):
@@ -239,7 +229,6 @@ cdef class MobSlotIter(BaseIterator):
239229
self.ptr.Release()
240230

241231
def reset(self):
242-
super(MobSlotIter, self).reset()
243232
error_check(self.ptr.Reset())
244233

245234
def clone(self):
@@ -267,7 +256,6 @@ cdef class MobIter(BaseIterator):
267256
self.ptr.Release()
268257

269258
def reset(self):
270-
super(MobIter, self).reset()
271259
error_check(self.ptr.Reset())
272260

273261
def clone(self):
@@ -321,7 +309,6 @@ cdef class PluginDefIter(BaseIterator):
321309
self.ptr.Release()
322310

323311
def reset(self):
324-
super(PluginDefIter, self).reset()
325312
error_check(self.ptr.Reset())
326313

327314
def clone(self):
@@ -349,7 +336,6 @@ cdef class PropIter(BaseIterator):
349336
self.ptr.Release()
350337

351338
def reset(self):
352-
super(PropIter, self).reset()
353339
error_check(self.ptr.Reset())
354340

355341
def clone(self):
@@ -377,7 +363,6 @@ cdef class PropertyDefsIter(BaseIterator):
377363
self.ptr.Release()
378364

379365
def reset(self):
380-
super(PropertyDefsIter, self).reset()
381366
error_check(self.ptr.Reset())
382367

383368
def clone(self):
@@ -405,7 +390,6 @@ cdef class PropValueIter(BaseIterator):
405390
self.ptr.Release()
406391

407392
def reset(self):
408-
super(PropValueIter, self).reset()
409393
error_check(self.ptr.Reset())
410394

411395
def clone(self):
@@ -433,7 +417,6 @@ cdef class PropValueResolveIter(BaseIterator):
433417
self.ptr.Release()
434418

435419
def reset(self):
436-
super(PropValueResolveIter, self).reset()
437420
error_check(self.ptr.Reset())
438421

439422
def clone(self):
@@ -461,7 +444,6 @@ cdef class SegmentIter(BaseIterator):
461444
self.ptr.Release()
462445

463446
def reset(self):
464-
super(SegmentIter, self).reset()
465447
error_check(self.ptr.Reset())
466448

467449
def clone(self):
@@ -489,7 +471,6 @@ cdef class TaggedValueIter(BaseIterator):
489471
self.ptr.Release()
490472

491473
def reset(self):
492-
super(TaggedValueIter, self).reset()
493474
error_check(self.ptr.Reset())
494475

495476
def clone(self):
@@ -517,7 +498,6 @@ cdef class TypeDefIter(BaseIterator):
517498
self.ptr.Release()
518499

519500
def reset(self):
520-
super(TypeDefIter, self).reset()
521501
error_check(self.ptr.Reset())
522502

523503
def clone(self):
@@ -544,7 +524,6 @@ cdef class TypeDefStreamDataIter(BaseIterator):
544524
return self
545525

546526
def reset(self):
547-
super(TypeDefStreamDataIter, self).reset()
548527
self.stream_typedef.set_position(self.value, 0)
549528

550529
def __next__(self):

‎aaf/storage.pyx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ cdef class ContentStorage(AAFObject):
231231

232232
cdef lib.aafSearchCrit_t search_crit
233233

234-
mob_iter.search_crit.searchTag = lib.kAAFByMobKind
235-
mob_iter.search_crit.tags.mobKind = lib.kAAFAllMob
234+
search_crit.searchTag = lib.kAAFByMobKind
235+
search_crit.tags.mobKind = lib.kAAFAllMob
236236

237-
error_check(self.ptr.GetMobs(&mob_iter.search_crit, &mob_iter.ptr))
237+
error_check(self.ptr.GetMobs(&search_crit, &mob_iter.ptr))
238238
mob_iter._clone_iter = self.mobs
239239
return mob_iter
240240

@@ -243,10 +243,10 @@ cdef class ContentStorage(AAFObject):
243243

244244
cdef lib.aafSearchCrit_t search_crit
245245

246-
mob_iter.search_crit.searchTag = lib.kAAFByMobKind
247-
mob_iter.search_crit.tags.mobKind = lib.kAAFMasterMob
246+
search_crit.searchTag = lib.kAAFByMobKind
247+
search_crit.tags.mobKind = lib.kAAFMasterMob
248248

249-
error_check(self.ptr.GetMobs(&mob_iter.search_crit, &mob_iter.ptr))
249+
error_check(self.ptr.GetMobs(&search_crit, &mob_iter.ptr))
250250
mob_iter._clone_iter = self.master_mobs
251251
return mob_iter
252252

@@ -255,10 +255,10 @@ cdef class ContentStorage(AAFObject):
255255

256256
cdef lib.aafSearchCrit_t search_crit
257257

258-
mob_iter.search_crit.searchTag = lib.kAAFByMobKind
259-
mob_iter.search_crit.tags.mobKind = lib.kAAFCompMob
258+
search_crit.searchTag = lib.kAAFByMobKind
259+
search_crit.tags.mobKind = lib.kAAFCompMob
260260

261-
error_check(self.ptr.GetMobs(&mob_iter.search_crit, &mob_iter.ptr))
261+
error_check(self.ptr.GetMobs(&search_crit, &mob_iter.ptr))
262262
mob_iter._clone_iter = self.composition_mobs
263263
return mob_iter
264264

@@ -267,10 +267,10 @@ cdef class ContentStorage(AAFObject):
267267

268268
cdef lib.aafSearchCrit_t search_crit
269269

270-
mob_iter.search_crit.searchTag = lib.kAAFByCompositionMobUsageCode
271-
mob_iter.search_crit.tags.usageCode = lib.kAAFUsage_TopLevel
270+
search_crit.searchTag = lib.kAAFByCompositionMobUsageCode
271+
search_crit.tags.usageCode = lib.kAAFUsage_TopLevel
272272

273-
error_check(self.ptr.GetMobs(&mob_iter.search_crit, &mob_iter.ptr))
273+
error_check(self.ptr.GetMobs(&search_crit, &mob_iter.ptr))
274274
mob_iter._clone_iter = self.toplevel_mobs
275275
return mob_iter
276276

0 commit comments

Comments
 (0)