Mike-Solar
66d761b4b7
- 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
109 lines
2.5 KiB
C++
109 lines
2.5 KiB
C++
/***
|
|
|
|
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 "viewerwindow.h"
|
|
|
|
#include <QKeyEvent>
|
|
#include <QVBoxLayout>
|
|
|
|
namespace olive
|
|
{
|
|
|
|
ViewerWindow::ViewerWindow(QWidget *parent)
|
|
: QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint)
|
|
, pixel_aspect_(1)
|
|
{
|
|
QVBoxLayout *layout = new QVBoxLayout(this);
|
|
layout->setContentsMargins(0, 0, 0, 0);
|
|
layout->setSpacing(0);
|
|
|
|
display_widget_ = new ViewerDisplayWidget();
|
|
layout->addWidget(display_widget_);
|
|
}
|
|
|
|
ViewerDisplayWidget *ViewerWindow::display_widget() const
|
|
{
|
|
return display_widget_;
|
|
}
|
|
|
|
void ViewerWindow::set_video_params(const oak::VideoParams ¶ms)
|
|
{
|
|
width_ = params.width();
|
|
height_ = params.height();
|
|
pixel_aspect_ = params.pixel_aspect_ratio();
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::set_resolution(int width, int height)
|
|
{
|
|
width_ = width;
|
|
height_ = height;
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::set_pixel_aspect_ratio(const Rational &pixel_aspect)
|
|
{
|
|
pixel_aspect_ = pixel_aspect;
|
|
|
|
update_matrix();
|
|
}
|
|
|
|
void ViewerWindow::keyPressEvent(QKeyEvent *e)
|
|
{
|
|
QWidget::keyPressEvent(e);
|
|
|
|
if (e->key() == Qt::Key_Escape) {
|
|
close();
|
|
}
|
|
}
|
|
|
|
void ViewerWindow::closeEvent(QCloseEvent *e)
|
|
{
|
|
QWidget::closeEvent(e);
|
|
|
|
deleteLater();
|
|
}
|
|
|
|
void ViewerWindow::update_matrix()
|
|
{
|
|
// Set GL widget matrix to maintain this texture's aspect ratio
|
|
double window_ar = static_cast<double>(this->width()) /
|
|
static_cast<double>(this->height());
|
|
double image_ar = static_cast<double>(width_) /
|
|
static_cast<double>(height_) * pixel_aspect_.to_double();
|
|
|
|
QMatrix4x4 mat;
|
|
|
|
if (window_ar > image_ar) {
|
|
// Window is wider than image, adjust X scale
|
|
mat.scale(image_ar / window_ar, 1.0f, 1.0f);
|
|
} else if (window_ar < image_ar) {
|
|
// Window is taller than image, adjust Y scale
|
|
mat.scale(1.0f, window_ar / image_ar, 1.0f);
|
|
}
|
|
|
|
display_widget_->set_matrix_zoom(mat);
|
|
}
|
|
|
|
}
|