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:
@@ -1,276 +0,0 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2022 Olive Team
|
||||
Modifications Copyright (C) 2025 mikesolar
|
||||
|
||||
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/>.
|
||||
|
||||
***/
|
||||
|
||||
#include "add.h"
|
||||
#include "core.h"
|
||||
#include "oakengine/node.h"
|
||||
#include "oakengine/timeline.h"
|
||||
#include "oakengine/undo.h"
|
||||
#include "widget/timelinewidget/cliphandle.h"
|
||||
#include "widget/timelinewidget/timelinewidget.h"
|
||||
#include "widget/timelinewidget/trackhandle.h"
|
||||
|
||||
#include "widget/viewer/vieweroutpututils.h"
|
||||
namespace olive
|
||||
{
|
||||
|
||||
AddTool::AddTool(TimelineWidget *parent)
|
||||
: BeamTool(parent)
|
||||
, ghost_(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
void AddTool::mouse_press(TimelineViewMouseEvent *event)
|
||||
{
|
||||
const TrackReference &track = event->get_track();
|
||||
|
||||
// Check if track is locked
|
||||
OakEngineTrack *t = parent()->get_track_from_reference(track);
|
||||
if (track_is_locked(t)) {
|
||||
return;
|
||||
}
|
||||
|
||||
TrackReference::Type add_type = TrackReference::k_none;
|
||||
|
||||
switch (Core::instance()->get_selected_addable_object()) {
|
||||
case Tool::k_addable_bars:
|
||||
case Tool::k_addable_solid:
|
||||
case Tool::k_addable_title:
|
||||
case Tool::k_addable_shape:
|
||||
add_type = TrackReference::k_video;
|
||||
break;
|
||||
case Tool::k_addable_tone:
|
||||
add_type = TrackReference::k_audio;
|
||||
break;
|
||||
case Tool::k_addable_subtitle:
|
||||
add_type = TrackReference::k_subtitle;
|
||||
break;
|
||||
case Tool::k_addable_empty:
|
||||
// Leave as "none", which means this block can be placed on any track
|
||||
break;
|
||||
case Tool::k_addable_count:
|
||||
// Return so we do nothing
|
||||
return;
|
||||
}
|
||||
|
||||
if (add_type == TrackReference::k_none || add_type == track.type()) {
|
||||
drag_start_point_ =
|
||||
validated_coordinate(event->get_coordinates(true)).get_frame();
|
||||
|
||||
ghost_ = new TimelineViewGhostItem();
|
||||
ghost_->set_in(drag_start_point_);
|
||||
ghost_->set_out(drag_start_point_);
|
||||
ghost_->set_track(track);
|
||||
parent()->add_ghost(ghost_);
|
||||
|
||||
snap_points_.push_back(drag_start_point_);
|
||||
}
|
||||
}
|
||||
|
||||
void AddTool::mouse_move(TimelineViewMouseEvent *event)
|
||||
{
|
||||
if (!ghost_) {
|
||||
return;
|
||||
}
|
||||
|
||||
mouse_move_internal(event->get_frame(),
|
||||
event->get_modifiers() & Qt::AltModifier);
|
||||
}
|
||||
|
||||
void AddTool::mouse_release(TimelineViewMouseEvent *event)
|
||||
{
|
||||
if (ghost_) {
|
||||
if (!ghost_->get_adjusted_length().isNull()) {
|
||||
void *command = oakengine_undo_command_create_multi();
|
||||
|
||||
if (void *subtitle_section_command =
|
||||
parent()->take_subtitle_section_command()) {
|
||||
oakengine_undo_command_multi_add_child(command, subtitle_section_command);
|
||||
}
|
||||
|
||||
OakEngineSequence *s = sequence();
|
||||
|
||||
QRectF r;
|
||||
if (Core::instance()->get_selected_addable_object() ==
|
||||
Tool::k_addable_title) {
|
||||
oak::VideoParams svp = viewer_output_video_params(s);
|
||||
r = QRectF(0, 0, svp.width(), svp.height());
|
||||
r.adjust(svp.width() / 10, svp.height() / 10, -svp.width() / 10,
|
||||
-svp.height() / 10);
|
||||
}
|
||||
|
||||
create_addable_clip(command, s, ghost_->get_track(),
|
||||
ghost_->get_adjusted_in(),
|
||||
ghost_->get_adjusted_length(), r);
|
||||
|
||||
oakengine_undo_push(
|
||||
command, qApp->translate("AddTool", "Added Clip").toUtf8().constData());
|
||||
}
|
||||
|
||||
parent()->clear_ghosts();
|
||||
snap_points_.clear();
|
||||
ghost_ = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
OakEngineNode *AddTool::create_addable_clip(void *command, OakEngineSequence *sequence,
|
||||
const TrackReference &track,
|
||||
const Rational &in, const Rational &length,
|
||||
const QRectF &rect)
|
||||
{
|
||||
OakEngineBlock *clip;
|
||||
if (Core::instance()->get_selected_addable_object() ==
|
||||
Tool::k_addable_subtitle) {
|
||||
clip = reinterpret_cast<OakEngineBlock*>(oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.subtitle"));
|
||||
} else {
|
||||
clip = clip_create_empty(olive::Tool::get_addable_object_name(
|
||||
Core::instance()->get_selected_addable_object()).toUtf8().constData());
|
||||
}
|
||||
OakEngineProject *graph = oakengine_node_get_project(
|
||||
reinterpret_cast<OakEngineNode *>(sequence));
|
||||
|
||||
oakengine_undo_command_multi_add_child(command,
|
||||
oakengine_node_add_to_project_command(
|
||||
graph,
|
||||
reinterpret_cast<OakEngineNode *>(clip)));
|
||||
oakengine_undo_command_multi_add_child(command, oakengine_node_set_position_command(reinterpret_cast<void *>(clip), reinterpret_cast<void *>(clip), 0, 0, 0));
|
||||
// Set the clip's length before placement through a trim command child
|
||||
// (children redo in order): oakengine_block_set_length_and_media_out()
|
||||
// requires the block to already be on a track (OAKENGINE_E_STATE), and
|
||||
// pre-placement there are no adjacent blocks, so a trim-out command
|
||||
// reduces to Block::set_length_and_media_out().
|
||||
oakengine_undo_command_multi_add_child(command,
|
||||
oakengine_block_trim_command(
|
||||
reinterpret_cast<void *>(oakengine_sequence_track_at(
|
||||
sequence,
|
||||
track.type(), track.index())),
|
||||
reinterpret_cast<void *>(clip),
|
||||
length.numerator(), length.denominator(),
|
||||
OAKENGINE_MOVEMENT_MODE_TRIM_OUT, 0));
|
||||
oakengine_undo_command_multi_add_child(command, oakengine_track_place_block_command(reinterpret_cast<void *>(oakengine_sequence_track_list(sequence, track.type())), track.index(), reinterpret_cast<void *>(clip), core::Timecode::time_to_timestamp(in, sequence_timebase(sequence))));
|
||||
|
||||
OakEngineNode *node_to_add = nullptr;
|
||||
|
||||
switch (Core::instance()->get_selected_addable_object()) {
|
||||
case Tool::k_addable_empty:
|
||||
// Empty, nothing to be done
|
||||
break;
|
||||
case Tool::k_addable_solid:
|
||||
node_to_add = oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.solidgenerator");
|
||||
break;
|
||||
case Tool::k_addable_shape:
|
||||
node_to_add = oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.shape");
|
||||
break;
|
||||
case Tool::k_addable_title:
|
||||
node_to_add = oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.text3");
|
||||
break;
|
||||
case Tool::k_addable_bars:
|
||||
case Tool::k_addable_tone:
|
||||
// Not implemented yet
|
||||
qWarning() << "Unimplemented add object:"
|
||||
<< Core::instance()->get_selected_addable_object();
|
||||
break;
|
||||
case Tool::k_addable_subtitle:
|
||||
// The block itself is the node we want
|
||||
break;
|
||||
case Tool::k_addable_count:
|
||||
// Invalid value, do nothing
|
||||
break;
|
||||
}
|
||||
|
||||
if (node_to_add) {
|
||||
QPointF extra_node_offset(k_default_distance_from_output, 0);
|
||||
oakengine_undo_command_multi_add_child(command,
|
||||
oakengine_node_add_to_project_command(
|
||||
reinterpret_cast<OakEngineProject *>(graph),
|
||||
reinterpret_cast<OakEngineNode *>(node_to_add)));
|
||||
oakengine_undo_command_multi_add_child(
|
||||
command,
|
||||
oakengine_node_connect_command(
|
||||
reinterpret_cast<OakEngineNode *>(node_to_add),
|
||||
reinterpret_cast<OakEngineNode *>(clip),
|
||||
oakengine_clip_buffer_input_id(),
|
||||
-1));
|
||||
oakengine_undo_command_multi_add_child(command, oakengine_node_set_position_command(reinterpret_cast<void *>(node_to_add), reinterpret_cast<void *>(clip), extra_node_offset.x(), extra_node_offset.y(), 0));
|
||||
|
||||
if (!rect.isNull()) {
|
||||
const oak::VideoParams vp = viewer_output_video_params(sequence);
|
||||
oak_video_params pod = {};
|
||||
pod.width = vp.width();
|
||||
pod.height = vp.height();
|
||||
pod.time_base_num = vp.time_base().numerator();
|
||||
pod.time_base_den = vp.time_base().denominator();
|
||||
pod.format = vp.format();
|
||||
pod.pixel_aspect_num = vp.pixel_aspect_ratio().numerator();
|
||||
pod.pixel_aspect_den = vp.pixel_aspect_ratio().denominator();
|
||||
pod.interlacing = vp.interlacing();
|
||||
pod.divider = vp.divider();
|
||||
oakengine_shape_set_rect_undoable(
|
||||
reinterpret_cast<OakEngineNode *>(node_to_add), rect.x(),
|
||||
rect.y(), rect.width(), rect.height(), &pod, command);
|
||||
}
|
||||
}
|
||||
|
||||
return node_to_add;
|
||||
}
|
||||
|
||||
void AddTool::mouse_move_internal(const Rational &cursor_frame, bool outwards)
|
||||
{
|
||||
// Calculate movement
|
||||
Rational movement = cursor_frame - drag_start_point_;
|
||||
|
||||
// Validation: Ensure in point never goes below 0
|
||||
if (movement < -ghost_->get_in() ||
|
||||
(outwards && -movement < -ghost_->get_in())) {
|
||||
movement = -ghost_->get_in();
|
||||
}
|
||||
|
||||
// Snap movement
|
||||
bool snapped;
|
||||
|
||||
if (Core::instance()->snapping()) {
|
||||
snapped = parent()->snap_point(snap_points_, &movement);
|
||||
} else {
|
||||
snapped = false;
|
||||
}
|
||||
|
||||
// If alt is held, our movement goes both ways (outwards)
|
||||
if (!snapped && outwards) {
|
||||
// Snap backwards too
|
||||
movement = -movement;
|
||||
parent()->snap_point(snap_points_, &movement);
|
||||
// We don't need to un-neg here because outwards means all future processing will be done both pos and neg
|
||||
}
|
||||
|
||||
// Make adjustment
|
||||
if (!movement) {
|
||||
ghost_->set_in_adjustment(0);
|
||||
ghost_->set_out_adjustment(0);
|
||||
} else if (movement > 0) {
|
||||
ghost_->set_in_adjustment(outwards ? -movement : 0);
|
||||
ghost_->set_out_adjustment(movement);
|
||||
} else if (movement < 0) {
|
||||
ghost_->set_in_adjustment(movement);
|
||||
ghost_->set_out_adjustment(outwards ? -movement : 0);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user