Merge branch 'master' into multicam

2022-10-01 13:51:04 -07:00
parent 69679d4494 df97df635d
commit e91ae5e4df
16 changed files with 230 additions and 45 deletions
@@ -232,7 +232,7 @@ void ClipBlock::RequestRangeFromConnected(const TimeRange &range)
        {
          TimeRange thumb_range = range.Intersected(max_range);
          if (GetAdjustedThumbnailRange(&thumb_range)) {
-            emit connected->thumbnail_cache()->Request(thumb_range);
+            connected->thumbnail_cache()->Request(thumb_range);
          }
        }

@@ -296,7 +296,7 @@ void ClipBlock::RequestRangeForCache(PlaybackCache *cache, const TimeRange &max_
  }

  if (request) {
-    emit cache->Request(r);
+    cache->Request(r);
  }
 }