Skip to content

Commit

Permalink
Remove support for passing a None value as the name argument to Marke…
Browse files Browse the repository at this point in the history
…r, Track, Stack and MissingReference constructors (#1453)


Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
  • Loading branch information
JeanChristopheMorinPerso committed Oct 18, 2022
1 parent bc504f7 commit d59a358
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Expand Up @@ -211,12 +211,12 @@ A marker indicates a marked range of time on an item in a timeline, usually with
The marked range may have a zero duration. The marked range is in the owning item's time coordinate system.
)docstring")
.def(py::init([](
optional<std::string> name,
std::string name,
TimeRange marked_range,
std::string const& color,
py::object metadata) {
return new Marker(
name.value_or(""),
name,
marked_range,
color,
py_to_any_dictionary(metadata));
Expand Down Expand Up @@ -552,12 +552,12 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
.value("never", Track::NeighborGapPolicy::never);

track_class
.def(py::init([](optional<std::string> name, optional<std::vector<Composable*>> children,
.def(py::init([](std::string name, optional<std::vector<Composable*>> children,
optional<TimeRange> const& source_range,
std::string const& kind, py::object metadata) {
auto composable_children = vector_or_default<Composable>(children);
Track* t = new Track(
name.value_or(""),
name,
source_range,
kind,
py_to_any_dictionary(metadata)
Expand Down Expand Up @@ -586,15 +586,15 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u


py::class_<Stack, Composition, managing_ptr<Stack>>(m, "Stack", py::dynamic_attr())
.def(py::init([](optional<std::string> name,
.def(py::init([](std::string name,
optional<std::vector<Composable*>> children,
optional<TimeRange> const& source_range,
optional<std::vector<Marker*>> markers,
optional<std::vector<Effect*>> effects,
py::object metadata) {
auto composable_children = vector_or_default<Composable>(children);
Stack* s = new Stack(
name.value_or(""),
name,
source_range,
py_to_any_dictionary(metadata),
vector_or_default<Effect>(effects),
Expand Down Expand Up @@ -742,12 +742,12 @@ Represents media for which a concrete reference is missing.
Note that a :class:`~MissingReference` may have useful metadata, even if the location of the media is not known.
)docstring")
.def(py::init([](
optional<std::string> name,
std::string name,
optional<TimeRange> available_range,
py::object metadata,
optional<Imath::Box2d> const& available_image_bounds) {
return new MissingReference(
name.value_or(""),
name,
available_range,
py_to_any_dictionary(metadata),
available_image_bounds);
Expand Down
2 changes: 1 addition & 1 deletion src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
Expand Up @@ -738,7 +738,7 @@ def track_for_element(self, track_element, track_kind, context):
"""
local_context = context.context_pushing_element(track_element)
name_element = track_element.find("./name")
track_name = (name_element.text if name_element is not None else None)
track_name = (name_element.text if name_element is not None else '')

timeline_item_tags = {"clipitem", "generatoritem", "transitionitem"}

Expand Down

0 comments on commit d59a358

Please sign in to comment.