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:
@@ -40,20 +40,20 @@ public:
|
||||
protected:
|
||||
virtual void finish_drag(TimelineViewMouseEvent *event);
|
||||
|
||||
virtual void initiate_drag(Block *clicked_item,
|
||||
Timeline::MovementMode trim_mode,
|
||||
virtual void initiate_drag(OakEngineBlock *clicked_item,
|
||||
TimelineApp::MovementMode trim_mode,
|
||||
Qt::KeyboardModifiers modifiers);
|
||||
|
||||
TimelineViewGhostItem *get_existing_ghost_from_block(Block *block);
|
||||
TimelineViewGhostItem *get_existing_ghost_from_block(OakEngineBlock *block);
|
||||
|
||||
TimelineViewGhostItem *add_ghost_from_block(Block *block,
|
||||
Timeline::MovementMode mode,
|
||||
TimelineViewGhostItem *add_ghost_from_block(OakEngineBlock *block,
|
||||
TimelineApp::MovementMode mode,
|
||||
bool check_if_exists = false);
|
||||
|
||||
TimelineViewGhostItem *add_ghost_from_null(const Rational &in,
|
||||
const Rational &out,
|
||||
const Track::Reference &track,
|
||||
Timeline::MovementMode mode);
|
||||
const TrackReference &track,
|
||||
TimelineApp::MovementMode mode);
|
||||
|
||||
/**
|
||||
* @brief Validates Ghosts that are getting their in points trimmed
|
||||
@@ -73,23 +73,23 @@ protected:
|
||||
|
||||
virtual void process_drag(const TimelineCoordinate &mouse_pos);
|
||||
|
||||
void initiate_drag_internal(Block *clicked_item,
|
||||
Timeline::MovementMode trim_mode,
|
||||
void initiate_drag_internal(OakEngineBlock *clicked_item,
|
||||
TimelineApp::MovementMode trim_mode,
|
||||
Qt::KeyboardModifiers modifiers,
|
||||
bool dont_roll_trims, bool allow_nongap_rolling,
|
||||
bool slide_instead_of_moving);
|
||||
|
||||
const Timeline::MovementMode &drag_movement_mode() const
|
||||
const TimelineApp::MovementMode &drag_movement_mode() const
|
||||
{
|
||||
return drag_movement_mode_;
|
||||
}
|
||||
void set_drag_movement_mode(const Timeline::MovementMode &d)
|
||||
void set_drag_movement_mode(const TimelineApp::MovementMode &d)
|
||||
{
|
||||
drag_movement_mode_ = d;
|
||||
}
|
||||
|
||||
static bool can_transition_move(TransitionBlock *transit,
|
||||
const QVector<Block *> &clips);
|
||||
static bool can_transition_move(OakEngineBlock *transit,
|
||||
const QVector<OakEngineBlock *> &clips);
|
||||
|
||||
void set_movement_allowed(bool e)
|
||||
{
|
||||
@@ -111,19 +111,19 @@ protected:
|
||||
gap_trimming_allowed_ = e;
|
||||
}
|
||||
|
||||
void set_clicked_item(Block *b)
|
||||
void set_clicked_item(OakEngineBlock *b)
|
||||
{
|
||||
clicked_item_ = b;
|
||||
}
|
||||
|
||||
private:
|
||||
Timeline::MovementMode is_cursor_in_trim_handle(Block *block, qreal cursor_x);
|
||||
TimelineApp::MovementMode is_cursor_in_trim_handle(OakEngineBlock *block, qreal cursor_x);
|
||||
|
||||
void add_ghost_internal(TimelineViewGhostItem *ghost,
|
||||
Timeline::MovementMode mode);
|
||||
TimelineApp::MovementMode mode);
|
||||
|
||||
bool is_clip_trimmable(Block *clip, const QVector<Block *> &items,
|
||||
const Timeline::MovementMode &mode);
|
||||
bool is_clip_trimmable(OakEngineBlock *clip, const QVector<OakEngineBlock *> &items,
|
||||
const TimelineApp::MovementMode &mode);
|
||||
|
||||
void process_ghosts_for_sliding();
|
||||
|
||||
@@ -136,10 +136,10 @@ private:
|
||||
bool can_rubberband_select_;
|
||||
bool rubberband_selecting_;
|
||||
|
||||
Track::Type drag_track_type_;
|
||||
Timeline::MovementMode drag_movement_mode_;
|
||||
TrackReference::Type drag_track_type_;
|
||||
TimelineApp::MovementMode drag_movement_mode_;
|
||||
|
||||
Block *clicked_item_;
|
||||
OakEngineBlock *clicked_item_;
|
||||
|
||||
QPoint drag_global_start_;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user