refactor: workspace layout — crates/, app at root, legacy C++ removed

Single mechanical restructure commit:
- root Cargo.toml = oakapp bin + workspace; one cargo build produces
  oakapp, oak-cli, oak-worker, liboakengine.dylib
- app/rust/src -> src/ (app at repo root, no rust/ nesting)
- src/<mod>/rust -> crates/oak<mod>; src/oakcore-rs -> crates/oakcore;
  src/bindings/oakotio -> crates/oakotio; src/engine/rust ->
  crates/oakengine (keeps cdylib+staticlib+rlib)
- public C headers include/<mod>/ -> crates/oakengine/include/<mod>/
- OFX SDK headers vendored into crates/oakplugin/ofx/ (HostSupport gone)
- legacy deleted: old src/ C++ modules, engine/, core/, ffmpeg_bridge/,
  app/ (Qt), cli/worker C++, root CMakeLists, third_party/KDDockWidgets
  submodule, otio-install, all build-* output (~40GB)
- oakstorage kept but excluded from the workspace (skeleton w/ todos);
  gpui excluded (own workspace)
- verified: cargo build green, cargo test --workspace 1845/0
  (with the documented OCIO_RS_* env override for the homebrew OCIO)
This commit is contained in:
2026-08-10 20:24:25 +08:00
parent f8540e3892
commit 013a175707
4212 changed files with 8331 additions and 2274987 deletions
+374
View File
@@ -0,0 +1,374 @@
// Oak Video Editor - Non-Linear Video Editor
// Copyright (C) 2026 Oak Team
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//! Blocks (C++ `Block`, `ClipBlock`, `GapBlock`, `TransitionBlock`).
//! `// CPP-PARITY: src/node/src/block/*`.
use oakcore_rs::{Rational, TimeRange};
use crate::id::NodeId;
use crate::input::Input;
use crate::node::{Category, NodeBehavior, NodeCore};
use crate::value::{NodeValue, ValueType};
/// Block core data (C++ `Block` members): timeline span + media range.
#[derive(Clone)]
pub struct BlockCore {
/// Position and length on the timeline.
pub range: TimeRange,
/// Media in-point.
pub media_in: Rational,
/// Speed (1.0 = normal).
pub speed: f64,
/// Reversed flag.
pub reversed: bool,
/// Linked blocks (C++ block_links_).
pub links: Vec<NodeId>,
/// Enabled flag (C++ `Block::enabled_`).
pub enabled: bool,
/// Maintain audio pitch (ClipBlock `maintain_audio_pitch_in`).
pub maintain_audio_pitch: bool,
/// Loop mode (ClipBlock `loop_in`).
pub loop_mode: i32,
/// Owning track id (None when trackless).
pub track: Option<NodeId>,
}
impl Default for BlockCore {
fn default() -> Self {
BlockCore {
range: TimeRange::new(Rational::new(0, 1), Rational::new(1, 1)),
media_in: Rational::new(0, 1),
speed: 1.0,
reversed: false,
links: Vec::new(),
enabled: true,
maintain_audio_pitch: false,
loop_mode: 0,
track: None,
}
}
}
impl BlockCore {
/// The timeline in-point (C++ `Block::in()`).
pub fn in_(&self) -> Rational {
self.range.in_()
}
/// The timeline out-point (C++ `Block::out()`).
pub fn out(&self) -> Rational {
self.range.out()
}
/// The timeline length (C++ `Block::length()`).
pub fn length(&self) -> Rational {
self.range.length()
}
/// Set the in-point, keeping the length (C++ `Block::set_in`).
pub fn set_in(&mut self, in_: Rational) {
let length = self.length();
self.range = TimeRange::new(in_, in_ + length);
}
/// Set the out-point, keeping the in-point (C++ `Block::set_out`).
pub fn set_out(&mut self, out: Rational) {
self.range = TimeRange::new(self.in_(), out);
}
/// Set the length, keeping the media out anchored (C++
/// `Block::set_length_and_media_out`): the timeline in-point shifts
/// so the out-point stays put, and the media in follows it.
pub fn set_length_and_media_out(&mut self, length: Rational) {
let out = self.in_() + self.length();
self.range = TimeRange::new(out - length, out);
self.media_in = self.range.in_();
}
/// Set the length, keeping the media in anchored (C++
/// `Block::set_length_and_media_in`): the in-point stays, the
/// out-point shifts.
pub fn set_length_and_media_in(&mut self, length: Rational) {
self.range = TimeRange::new(self.in_(), self.in_() + length);
}
/// Media out (in + length; C++ `Block::media_out`).
pub fn media_out(&self) -> Rational {
self.media_in + self.length()
}
}
/// Clip block behavior (media-bearing block; C++ `ClipBlock`).
pub struct ClipBlockBehavior {
/// Block core.
pub core: BlockCore,
/// Connected footage (via the footage input edge).
pub footage: Option<NodeId>,
}
/// Gap block behavior (empty span; C++ `GapBlock`).
pub struct GapBlockBehavior {
/// Block core.
pub core: BlockCore,
}
/// Transition block behavior (C++ `TransitionBlock`).
pub struct TransitionBlockBehavior {
/// Block core.
pub core: BlockCore,
/// In offset (C++ in_offset).
pub in_offset: Rational,
/// Out offset.
pub out_offset: Rational,
}
/// ClipBlock input ids (C++ `clip.cpp`).
pub mod clip_input {
/// `media_in_in` (rational, static).
pub const MEDIA_IN: &str = "media_in_in";
/// `speed_in` (float, static).
pub const SPEED: &str = "speed_in";
/// `reverse_in` (boolean, static).
pub const REVERSE: &str = "reverse_in";
/// `maintain_audio_pitch_in` (boolean, static).
pub const MAINTAIN_AUDIO_PITCH: &str = "maintain_audio_pitch_in";
/// `loop_in` (combo, static).
pub const LOOP_MODE: &str = "loop_in";
}
/// TransitionBlock connection inputs (C++ `transition.cpp`).
pub mod transition_input {
/// `out_block_in` (the outgoing side).
pub const OUT_BLOCK: &str = "out_block_in";
/// `in_block_in` (the incoming side).
pub const IN_BLOCK: &str = "in_block_in";
}
impl ClipBlockBehavior {
/// New clip with a default length of one second.
pub fn new() -> Self {
ClipBlockBehavior {
core: BlockCore::default(),
footage: None,
}
}
}
impl GapBlockBehavior {
/// New gap with a default length of one second.
pub fn new() -> Self {
GapBlockBehavior {
core: BlockCore::default(),
}
}
}
impl TransitionBlockBehavior {
/// New transition with zero offsets (C++ `TransitionBlock`).
pub fn new() -> Self {
TransitionBlockBehavior {
core: BlockCore::default(),
in_offset: Rational::new(0, 1),
out_offset: Rational::new(0, 1),
}
}
/// Whether both sides are connected to clips (C++
/// `TransitionBlock::is_dual`, graph-side query; the ffi checks the
/// edges).
pub fn is_dual(&self) -> bool {
false
}
}
fn block_categories() -> &'static [Category] {
&[Category::Timeline]
}
impl NodeBehavior for ClipBlockBehavior {
fn name(&self) -> &str {
"Clip"
}
fn type_id(&self) -> &str {
"org.olivevideoeditor.Olive.clipblock"
}
fn categories(&self) -> &[Category] {
block_categories()
}
fn as_any(&self) -> Option<&dyn std::any::Any> {
Some(self)
}
fn as_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
Some(self)
}
fn duplicate(&self, _core: &NodeCore) -> Option<Box<dyn NodeBehavior>> {
Some(Box::new(ClipBlockBehavior {
core: self.core.clone(),
footage: self.footage,
}))
}
}
impl NodeBehavior for GapBlockBehavior {
fn name(&self) -> &str {
"Gap"
}
fn type_id(&self) -> &str {
"org.olivevideoeditor.Olive.gapblock"
}
fn categories(&self) -> &[Category] {
block_categories()
}
fn as_any(&self) -> Option<&dyn std::any::Any> {
Some(self)
}
fn as_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
Some(self)
}
fn duplicate(&self, _core: &NodeCore) -> Option<Box<dyn NodeBehavior>> {
Some(Box::new(GapBlockBehavior {
core: self.core.clone(),
}))
}
}
impl NodeBehavior for TransitionBlockBehavior {
fn name(&self) -> &str {
"Transition"
}
fn type_id(&self) -> &str {
"org.olivevideoeditor.Olive.transitionblock"
}
fn categories(&self) -> &[Category] {
block_categories()
}
fn as_any(&self) -> Option<&dyn std::any::Any> {
Some(self)
}
fn as_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
Some(self)
}
fn duplicate(&self, _core: &NodeCore) -> Option<Box<dyn NodeBehavior>> {
Some(Box::new(TransitionBlockBehavior {
core: self.core.clone(),
in_offset: self.in_offset,
out_offset: self.out_offset,
}))
}
}
/// Constructor for a clip block (C++ `ClipBlock::ClipBlock()`): adds the
/// static clip inputs (`media_in_in`, `speed_in`, `reverse_in`,
/// `maintain_audio_pitch_in`, `autocache_in`, `loop_in`).
pub fn clip_create() -> (NodeCore, Box<dyn NodeBehavior>) {
let mut core = NodeCore::new();
let mut media_in = Input::new(
clip_input::MEDIA_IN,
ValueType::Rational,
NodeValue::Rational(Rational::new(0, 1)),
);
media_in.flags |= crate::input::flags::NOT_CONNECTABLE | crate::input::flags::NOT_KEYFRAMABLE;
core.add_input(media_in);
let mut speed = Input::new(
clip_input::SPEED,
ValueType::Float,
NodeValue::Float(1.0),
);
speed.flags |= crate::input::flags::NOT_CONNECTABLE | crate::input::flags::NOT_KEYFRAMABLE;
speed.properties = vec![
("min".to_string(), NodeValue::Float(0.0)),
("max".to_string(), NodeValue::Float(4.0)),
];
core.add_input(speed);
let mut reverse = Input::new(
clip_input::REVERSE,
ValueType::Boolean,
NodeValue::Boolean(false),
);
reverse.flags |= crate::input::flags::NOT_CONNECTABLE | crate::input::flags::NOT_KEYFRAMABLE;
core.add_input(reverse);
let mut pitch = Input::new(
clip_input::MAINTAIN_AUDIO_PITCH,
ValueType::Boolean,
NodeValue::Boolean(false),
);
pitch.flags |= crate::input::flags::NOT_CONNECTABLE | crate::input::flags::NOT_KEYFRAMABLE;
core.add_input(pitch);
let mut loop_mode = Input::new(
clip_input::LOOP_MODE,
ValueType::Combo,
NodeValue::Combo(0),
);
loop_mode.flags |= crate::input::flags::NOT_CONNECTABLE | crate::input::flags::NOT_KEYFRAMABLE;
loop_mode.properties = vec![(
"combobox_strings".to_string(),
NodeValue::Binary("No Loop,Loop Clips,Loop Section".as_bytes().to_vec()),
)];
core.add_input(loop_mode);
(core, Box::new(ClipBlockBehavior::new()))
}
/// Constructor for a gap block (C++ `GapBlock::GapBlock()`): no own
/// inputs.
pub fn gap_create() -> (NodeCore, Box<dyn NodeBehavior>) {
(NodeCore::new(), Box::new(GapBlockBehavior::new()))
}
/// Constructor for a transition block (C++ `TransitionBlock`): adds the
/// `out_block_in`/`in_block_in` node-typed connection inputs.
pub fn transition_create() -> (NodeCore, Box<dyn NodeBehavior>) {
let mut core = NodeCore::new();
let mut out = Input::new(
transition_input::OUT_BLOCK,
ValueType::NodeRef,
NodeValue::None,
);
out.flags |= crate::input::flags::NOT_KEYFRAMABLE;
out.display_name = "From".to_string();
core.add_input(out);
let mut inn = Input::new(
transition_input::IN_BLOCK,
ValueType::NodeRef,
NodeValue::None,
);
inn.flags |= crate::input::flags::NOT_KEYFRAMABLE;
inn.display_name = "To".to_string();
core.add_input(inn);
(core, Box::new(TransitionBlockBehavior::new()))
}