Commit e3706e49 authored by Alexandru Băluț's avatar Alexandru Băluț

x remove getTargetUri scaled parameter

parent c4ac5dbb
Pipeline #79917 failed with stage
in 31 minutes and 15 seconds
......@@ -1301,11 +1301,8 @@ class Project(Loggable, GES.Project):
def do_missing_uri(self, error, asset):
if self.app.proxy_manager.is_proxy_asset(asset):
scaled = False
if self.app.proxy_manager.is_scaled_proxy(asset):
scaled = True
self.debug("Missing proxy file: %s", asset.props.id)
target_uri = self.app.proxy_manager.getTargetUri(asset, scaled=scaled)
target_uri = self.app.proxy_manager.getTargetUri(asset)
# Take asset relocation into account.:
target_uri = self.relocated_assets.get(target_uri, target_uri)
......@@ -1315,6 +1312,7 @@ class Project(Loggable, GES.Project):
target = [asset for asset in self.list_assets(GES.UriClip) if
asset.props.id == target_uri]
if target:
scaled = self.app.proxy_manager.is_scaled_proxy(asset)
self.__regenerate_missing_proxy(target[0], scaled=scaled)
else:
self.__awaited_deleted_proxy_targets.add(target_uri)
......
......@@ -289,8 +289,8 @@ class ProxyManager(GObject.Object, Loggable):
self.emit("error-preparing-asset", None, proxy, proxy.get_error())
return False
def getTargetUri(self, proxy_asset, scaled=False):
if scaled:
def getTargetUri(self, proxy_asset):
if self.is_scaled_proxy(proxy_asset):
return ".".join(proxy_asset.props.id.split(".")[:-4])
return ".".join(proxy_asset.props.id.split(".")[:-3])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment