Skip to content

Commit 82027e4

Browse files
committed
Apply clang-format rules to cpp and h files that were previously missed.
1 parent 7cad8c0 commit 82027e4

19 files changed

Lines changed: 2815 additions & 1562 deletions

src/opentimelineio/algo/editAlgorithm.cpp

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

src/opentimelineio/algo/editAlgorithm.h

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
#include "opentimelineio/composition.h"
77

8-
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS { namespace algo {
8+
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION_NS {
9+
namespace algo {
910

1011
//! Enum used by 3/4 Point Edit (aka. as fill)
1112
enum class ReferencePoint
@@ -35,7 +36,7 @@ enum class ReferencePoint
3536
//
3637
// If overwrite range starts before A and partially overlaps it, C is
3738
// added at the beginning and A is partitioned.
38-
//
39+
//
3940
// If overwrite range starts and ends before A, a gap hole is filled with
4041
// fill_template.
4142
OTIO_API void overwrite(
@@ -75,19 +76,19 @@ OTIO_API void insert(
7576
//
7677
// | A | B | C | -> | A |FILL| B | C |
7778
// <--*
78-
//
79+
//
7980
// item = Item to apply trim to (usually a clip)
8081
// delta_in = RationalTime that the item's source_range().start_time()
8182
// will be adjusted by
8283
// delta_out = RationalTime that the item's
8384
// source_range().end_time_exclusive() will be adjusted by
8485
// fill_template = item to fill in (usually a gap),
8586
// when time > composition's time.
86-
//
87+
//
8788
// Do not affect other clips.
8889
// Fill now-"empty" time with gap or template
8990
// Unless item is meeting a Gap, then, existing Gap's duration will be augmented
90-
//
91+
//
9192
OTIO_API void trim(
9293
Item* item,
9394
RationalTime const& delta_in,
@@ -115,7 +116,7 @@ OTIO_API void slice(
115116
//
116117
// item = item to slip (usually a clip)
117118
// delta = +/- rational time to slip the item by.
118-
//
119+
//
119120
// Do not affect item duration.
120121
// Do not affect surrounding items.
121122
// Clamp to available_range of media (if available)
@@ -140,7 +141,7 @@ OTIO_API void slide(Item* item, RationalTime const& delta);
140141
//
141142
// | A | B | -> | A | B |FILL|
142143
// <--*
143-
//
144+
//
144145
// item = Item to apply ripple to (usually a clip)
145146
// delta_in = RationalTime that the item's source_range().start_time()
146147
// will be adjusted by
@@ -162,7 +163,7 @@ OTIO_API void ripple(
162163
//
163164
// | A | B | -> | A | B |
164165
// <--*
165-
//
166+
//
166167
// item = Item to apply roll to (usually a clip)
167168
// delta_in = RationalTime that the item's source_range().start_time()
168169
// will be adjusted by
@@ -191,11 +192,11 @@ OTIO_API void fill(
191192
Composition* track,
192193
RationalTime const& track_time,
193194
ReferencePoint const reference_point = ReferencePoint::Source,
194-
ErrorStatus* error_status = nullptr);
195+
ErrorStatus* error_status = nullptr);
195196

196197
//
197198
// Remove item(s) at a time and fill them, optionally with a gap.
198-
//
199+
//
199200
// | A | C | B | -> | A |GAP| B |
200201
// ^
201202
// |
@@ -210,8 +211,8 @@ OTIO_API void fill(
210211
OTIO_API void remove(
211212
Composition* composition,
212213
RationalTime const& time,
213-
bool const fill = true,
214+
bool const fill = true,
214215
Item* fill_template = nullptr,
215-
ErrorStatus* error_status = nullptr);
216+
ErrorStatus* error_status = nullptr);
216217

217218
}}} // namespace opentimelineio::OPENTIMELINEIO_VERSION_NS::algo

src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Contributors to the OpenTimelineIO project
33

4-
#include <pybind11/pybind11.h>
54
#include "opentime_bindings.h"
5+
#include <pybind11/pybind11.h>
66

7-
PYBIND11_MODULE(_opentime, m) {
7+
PYBIND11_MODULE(_opentime, m)
8+
{
89
m.doc() = "Bindings to C++ OTIO implementation";
910
opentime_rationalTime_bindings(m);
1011
opentime_timeRange_bindings(m);

src/py-opentimelineio/opentime-bindings/opentime_bindings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#ifndef OTIO_OPENTIME_BINDINGS_H
55
#define OTIO_OPENTIME_BINDINGS_H
66

7+
#include "opentime/rationalTime.h"
78
#include <pybind11/pybind11.h>
89
#include <string>
9-
#include "opentime/rationalTime.h"
1010

1111
void opentime_rationalTime_bindings(pybind11::module);
1212
void opentime_timeRange_bindings(pybind11::module);

0 commit comments

Comments
 (0)