R8: finish app/ pure C ABI migration (P3-P9) and make OTIO required
- app/ no longer includes engine C++ headers nor holds engine C++ types: engine access goes through the oakengine C ABI plus C++ wrappers (oakutil/oaknode.h, oakutil/oakvideo.h) and app-local mirror types (tooltypes, trackreferencehandle, timelinecommonapp, keyframetypes, subtitleapp, serializedlayoutinfoapp, nodevaluehandle, sliderdisplaytypeapp) - engine: new C ABI functions for block/track/clip/transition navigation and predicates, links, caches, waveform/playback, disk folder, sequence_track_list, node_free, footage_is_valid, block_get_track, get_brush; loadotio/saveotio ported to the current engine API - OTIO is now a required dependency: CI and CD build it on every platform, FindOpenTimelineIO fixed for OTIO 0.16/0.19 (the old deps include requirement silently disabled OTIO everywhere), runtime libraries are bundled into packages and copied next to macOS binaries (oak_copy_otio_runtime) - fix ProjectViewModel drag&drop mime read/write size mismatch (segfault) - unify color label naming (k_olive -> "Oak") in the app-side mirror - docs: OTIO required, FFmpeg minimum corrected to 6.0 (en/zh) - gtest suite: 1925 passed, 0 failed
This commit is contained in:
@@ -31,110 +31,81 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
class TimelineMarker;
|
||||
class TimelineMarkerList;
|
||||
|
||||
using olive::core::Rational;
|
||||
using olive::core::TimeRange;
|
||||
|
||||
/**
|
||||
* @brief Facade accessors for marker pointers held by the ruler/scrollbar
|
||||
* @brief Facade accessors for marker handles held by the ruler/scrollbar
|
||||
* widgets.
|
||||
*
|
||||
* The widgets keep olive::TimelineMarker* / olive::TimelineMarkerList* as
|
||||
* opaque identity pointers (selection, drawing, hit-testing). All engine
|
||||
* data and mutations go through the liboakengine C ABI
|
||||
* (oakengine/timeline.h); the pointer itself is only a handle. Marker
|
||||
* times are rational seconds (num/den pairs), not frame timestamps.
|
||||
* The widgets keep OakEngineMarker* / OakEngineMarkerList* as opaque
|
||||
* identity handles (selection, drawing, hit-testing). All engine data and
|
||||
* mutations go through the liboakengine C ABI (oakengine/timeline.h); the
|
||||
* handle itself is only an identity. Marker times are rational seconds
|
||||
* (num/den pairs), not frame timestamps.
|
||||
*/
|
||||
|
||||
inline OakEngineMarker *markerhandle(TimelineMarker *marker)
|
||||
{
|
||||
return reinterpret_cast<OakEngineMarker *>(marker);
|
||||
}
|
||||
|
||||
inline const OakEngineMarker *markerhandle(const TimelineMarker *marker)
|
||||
{
|
||||
return reinterpret_cast<const OakEngineMarker *>(marker);
|
||||
}
|
||||
|
||||
inline TimelineMarker *markerhandle(OakEngineMarker *marker)
|
||||
{
|
||||
return reinterpret_cast<TimelineMarker *>(marker);
|
||||
}
|
||||
|
||||
inline OakEngineMarkerList *markerlisthandle(TimelineMarkerList *list)
|
||||
{
|
||||
return reinterpret_cast<OakEngineMarkerList *>(list);
|
||||
}
|
||||
|
||||
inline const OakEngineMarkerList *markerlisthandle(
|
||||
const TimelineMarkerList *list)
|
||||
{
|
||||
return reinterpret_cast<const OakEngineMarkerList *>(list);
|
||||
}
|
||||
|
||||
inline TimeRange marker_time(const TimelineMarker *marker)
|
||||
inline TimeRange marker_time(const OakEngineMarker *marker)
|
||||
{
|
||||
int64_t in_num = 0, in_den = 1, out_num = 0, out_den = 1;
|
||||
oakengine_marker_get_time(markerhandle(marker), &in_num, &in_den,
|
||||
oakengine_marker_get_time(marker, &in_num, &in_den,
|
||||
&out_num, &out_den);
|
||||
return TimeRange(Rational(int(in_num), int(in_den)),
|
||||
Rational(int(out_num), int(out_den)));
|
||||
}
|
||||
|
||||
inline QString marker_name(const TimelineMarker *marker)
|
||||
inline QString marker_name(const OakEngineMarker *marker)
|
||||
{
|
||||
const int size =
|
||||
oakengine_marker_get_name(markerhandle(marker), nullptr, 0);
|
||||
oakengine_marker_get_name(marker, nullptr, 0);
|
||||
QByteArray buf(size + 1, '\0');
|
||||
oakengine_marker_get_name(markerhandle(marker), buf.data(),
|
||||
oakengine_marker_get_name(marker, buf.data(),
|
||||
int(buf.size()));
|
||||
return QString::fromUtf8(buf.constData());
|
||||
}
|
||||
|
||||
inline int marker_color(const TimelineMarker *marker)
|
||||
inline int marker_color(const OakEngineMarker *marker)
|
||||
{
|
||||
return oakengine_marker_get_color(markerhandle(marker));
|
||||
return oakengine_marker_get_color(marker);
|
||||
}
|
||||
|
||||
inline bool marker_has_sibling_at_time(const TimelineMarker *marker,
|
||||
inline bool marker_has_sibling_at_time(const OakEngineMarker *marker,
|
||||
const Rational &time)
|
||||
{
|
||||
return oakengine_marker_has_sibling_at_time(
|
||||
markerhandle(marker), time.numerator(), time.denominator()) != 0;
|
||||
marker, time.numerator(), time.denominator()) != 0;
|
||||
}
|
||||
|
||||
inline void marker_set_time_live(TimelineMarker *marker,
|
||||
inline void marker_set_time_live(OakEngineMarker *marker,
|
||||
const TimeRange &range)
|
||||
{
|
||||
oakengine_marker_set_time_live(
|
||||
markerhandle(marker), range.in().numerator(), range.in().denominator(),
|
||||
marker, range.in().numerator(), range.in().denominator(),
|
||||
range.out().numerator(), range.out().denominator());
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ADL customization points for
|
||||
* TimeBasedViewSelectionManager<TimelineMarker>.
|
||||
* TimeBasedViewSelectionManager<OakEngineMarker>.
|
||||
*
|
||||
* The selection manager template calls these unqualified; these overloads
|
||||
* route marker access through the facade (see
|
||||
* widget/keyframeview/keyframehandle.h for the NodeKeyframe equivalent).
|
||||
* selection_time_target_parent() is intentionally not overloaded: the
|
||||
* generic template in timebasedviewselectionmanager.h works for markers
|
||||
* and marker drags never pass a time target.
|
||||
* widget/keyframeview/keyframehandle.h for the keyframe equivalent).
|
||||
* Markers drag both their in and out points, hence selection_time_end().
|
||||
* selection_time_target_parent() returns nullptr: marker drags never pass
|
||||
* a time target.
|
||||
*/
|
||||
inline Rational selection_time(TimelineMarker *marker)
|
||||
inline Rational selection_time(OakEngineMarker *marker)
|
||||
{
|
||||
return marker_time(marker).in();
|
||||
}
|
||||
|
||||
inline Rational selection_time_end(TimelineMarker *marker)
|
||||
inline Rational selection_time_end(OakEngineMarker *marker)
|
||||
{
|
||||
return marker_time(marker).out();
|
||||
}
|
||||
|
||||
inline void selection_set_time(TimelineMarker *marker, const Rational &time)
|
||||
inline void selection_set_time(OakEngineMarker *marker, const Rational &time)
|
||||
{
|
||||
// Move the in-point keeping the range length (was
|
||||
// TimelineMarker::set_time(const Rational &))
|
||||
@@ -143,12 +114,18 @@ inline void selection_set_time(TimelineMarker *marker, const Rational &time)
|
||||
marker_set_time_live(marker, TimeRange(time, time + length));
|
||||
}
|
||||
|
||||
inline bool selection_has_sibling_at_time(TimelineMarker *marker,
|
||||
inline bool selection_has_sibling_at_time(OakEngineMarker *marker,
|
||||
const Rational &time)
|
||||
{
|
||||
return marker_has_sibling_at_time(marker, time);
|
||||
}
|
||||
|
||||
inline OakEngineNode *selection_time_target_parent(OakEngineMarker *marker)
|
||||
{
|
||||
Q_UNUSED(marker)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
} // namespace olive
|
||||
|
||||
#endif // OAK_MARKERHANDLE_H
|
||||
|
||||
Reference in New Issue
Block a user