rewrite nearly complete
This commit is contained in:
@@ -0,0 +1,103 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive 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/>.
|
||||
|
||||
***/
|
||||
|
||||
#include "clipboard.h"
|
||||
|
||||
#include "timeline/clip.h"
|
||||
#include "effects/effect.h"
|
||||
#include "effects/transition.h"
|
||||
|
||||
Clipboard::Clipboard() :
|
||||
type_(CLIPBOARD_TYPE_CLIP)
|
||||
{
|
||||
}
|
||||
|
||||
void Clipboard::Append(VoidPtr obj)
|
||||
{
|
||||
clipboard_.append(obj);
|
||||
}
|
||||
|
||||
void Clipboard::Insert(int pos, VoidPtr obj)
|
||||
{
|
||||
clipboard_.insert(pos, obj);
|
||||
}
|
||||
|
||||
void Clipboard::RemoveAt(int pos)
|
||||
{
|
||||
clipboard_.removeAt(pos);
|
||||
}
|
||||
|
||||
void Clipboard::Clear()
|
||||
{
|
||||
clipboard_.clear();
|
||||
clipboard_transitions_.clear();
|
||||
}
|
||||
|
||||
int Clipboard::Count()
|
||||
{
|
||||
return clipboard_.size();
|
||||
}
|
||||
|
||||
VoidPtr Clipboard::Get(int i)
|
||||
{
|
||||
return clipboard_.at(i);
|
||||
}
|
||||
|
||||
void Clipboard::SetType(Clipboard::Type type)
|
||||
{
|
||||
if (type == type_) {
|
||||
return;
|
||||
}
|
||||
|
||||
Clear();
|
||||
type_ = type;
|
||||
}
|
||||
|
||||
bool Clipboard::IsEmpty()
|
||||
{
|
||||
return clipboard_.isEmpty();
|
||||
}
|
||||
|
||||
Clipboard::Type Clipboard::type()
|
||||
{
|
||||
return type_;
|
||||
}
|
||||
|
||||
bool Clipboard::DeleteClipsWithMedia(ComboAction *ca, Media *m)
|
||||
{
|
||||
if (type_ != CLIPBOARD_TYPE_CLIP) {
|
||||
return false;
|
||||
}
|
||||
|
||||
int delete_count = 0;
|
||||
|
||||
for (int i=0;i<clipboard_.size();i++) {
|
||||
Clip* c = std::static_pointer_cast<Clip>(clipboard_.at(i)).get();
|
||||
|
||||
if (c->media() == m) {
|
||||
ca->append(new RemoveClipsFromClipboard(i-delete_count));
|
||||
delete_count++;
|
||||
}
|
||||
}
|
||||
|
||||
return (delete_count > 0);
|
||||
}
|
||||
|
||||
Clipboard olive::clipboard;
|
||||
@@ -0,0 +1,61 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive 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/>.
|
||||
|
||||
***/
|
||||
|
||||
#ifndef CLIPBOARD_H
|
||||
#define CLIPBOARD_H
|
||||
|
||||
#include <QVector>
|
||||
|
||||
#include "effects/transition.h"
|
||||
|
||||
using VoidPtr = std::shared_ptr<void>;
|
||||
|
||||
class Clipboard {
|
||||
public:
|
||||
enum Type {
|
||||
CLIPBOARD_TYPE_CLIP,
|
||||
CLIPBOARD_TYPE_EFFECT
|
||||
};
|
||||
|
||||
Clipboard();
|
||||
void Append(VoidPtr obj);
|
||||
void Insert(int pos, VoidPtr obj);
|
||||
void RemoveAt(int pos);
|
||||
void Clear();
|
||||
int Count();
|
||||
VoidPtr Get(int i);
|
||||
void SetType(Type type);
|
||||
bool IsEmpty();
|
||||
Type type();
|
||||
|
||||
bool DeleteClipsWithMedia(ComboAction* ca, Media* m);
|
||||
|
||||
private:
|
||||
Type type_;
|
||||
|
||||
QVector<TransitionPtr> clipboard_transitions_;
|
||||
QVector<VoidPtr> clipboard_;
|
||||
};
|
||||
|
||||
namespace olive {
|
||||
extern Clipboard clipboard;
|
||||
}
|
||||
|
||||
#endif // CLIPBOARD_H
|
||||
+5
-10
@@ -29,12 +29,11 @@
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
Config olive::CurrentConfig;
|
||||
RuntimeConfig olive::CurrentRuntimeConfig;
|
||||
Config olive::config;
|
||||
RuntimeConfig olive::runtime_config;
|
||||
|
||||
Config::Config()
|
||||
: show_track_lines(true),
|
||||
scroll_zooms(false),
|
||||
: scroll_zooms(false),
|
||||
edit_tool_selects_links(false),
|
||||
edit_tool_also_seeks(false),
|
||||
select_also_seeks(false),
|
||||
@@ -94,10 +93,7 @@ void Config::load(QString path) {
|
||||
while (!stream.atEnd()) {
|
||||
stream.readNext();
|
||||
if (stream.isStartElement()) {
|
||||
if (stream.name() == "ShowTrackLines") {
|
||||
stream.readNext();
|
||||
show_track_lines = (stream.text() == "1");
|
||||
} else if (stream.name() == "ScrollZooms") {
|
||||
if (stream.name() == "ScrollZooms") {
|
||||
stream.readNext();
|
||||
scroll_zooms = (stream.text() == "1");
|
||||
} else if (stream.name() == "InvertTimelineScrollAxes") {
|
||||
@@ -295,7 +291,6 @@ void Config::save(QString path) {
|
||||
stream.writeStartElement("Configuration"); // configuration
|
||||
|
||||
stream.writeTextElement("Version", QString::number(olive::kSaveVersion));
|
||||
stream.writeTextElement("ShowTrackLines", QString::number(show_track_lines));
|
||||
stream.writeTextElement("ScrollZooms", QString::number(scroll_zooms));
|
||||
stream.writeTextElement("InvertTimelineScrollAxes", QString::number(invert_timeline_scroll_axes));
|
||||
stream.writeTextElement("EditToolSelectsLinks", QString::number(edit_tool_selects_links));
|
||||
@@ -320,7 +315,7 @@ void Config::save(QString path) {
|
||||
stream.writeTextElement("HoverFocus", QString::number(hover_focus));
|
||||
stream.writeTextElement("ProjectViewType", QString::number(project_view_type));
|
||||
stream.writeTextElement("SetNameWithMarker", QString::number(set_name_with_marker));
|
||||
stream.writeTextElement("ShowProjectToolbar", QString::number(panel_project->IsToolbarVisible()));
|
||||
stream.writeTextElement("ShowProjectToolbar", QString::number(panel_project.first()->IsToolbarVisible()));
|
||||
stream.writeTextElement("PreviousFrameQueueSize", QString::number(previous_queue_size));
|
||||
stream.writeTextElement("PreviousFrameQueueType", QString::number(previous_queue_type));
|
||||
stream.writeTextElement("UpcomingFrameQueueSize", QString::number(upcoming_queue_size));
|
||||
|
||||
+3
-9
@@ -24,6 +24,7 @@
|
||||
#include <QString>
|
||||
|
||||
#include "ui/styling.h"
|
||||
#include "timeline/timelinetools.h"
|
||||
|
||||
namespace olive {
|
||||
/**
|
||||
@@ -159,13 +160,6 @@ struct Config {
|
||||
*/
|
||||
Config();
|
||||
|
||||
/**
|
||||
* @brief Show track lines
|
||||
*
|
||||
* **TRUE** if the Timeline should show lines between tracks.
|
||||
*/
|
||||
bool show_track_lines;
|
||||
|
||||
/**
|
||||
* @brief The scroll wheel zooms rather than scrolls
|
||||
*
|
||||
@@ -674,8 +668,8 @@ struct RuntimeConfig {
|
||||
};
|
||||
|
||||
namespace olive {
|
||||
extern Config CurrentConfig;
|
||||
extern RuntimeConfig CurrentRuntimeConfig;
|
||||
extern Config config;
|
||||
extern RuntimeConfig runtime_config;
|
||||
}
|
||||
|
||||
#endif // CONFIG_H
|
||||
|
||||
+58
-67
@@ -30,7 +30,8 @@
|
||||
#include "panels/panels.h"
|
||||
#include "global/path.h"
|
||||
#include "global/config.h"
|
||||
#include "project/clipboard.h"
|
||||
#include "global/timing.h"
|
||||
#include "global/clipboard.h"
|
||||
#include "rendering/audio.h"
|
||||
#include "dialogs/demonotice.h"
|
||||
#include "dialogs/preferencesdialog.h"
|
||||
@@ -147,12 +148,12 @@ QString OliveGlobal::get_recent_project_list_file() {
|
||||
}
|
||||
|
||||
void OliveGlobal::load_translation_from_config() {
|
||||
QString language_file = olive::CurrentRuntimeConfig.external_translation_file.isEmpty() ?
|
||||
olive::CurrentConfig.language_file :
|
||||
olive::CurrentRuntimeConfig.external_translation_file;
|
||||
QString language_file = olive::runtime_config.external_translation_file.isEmpty() ?
|
||||
olive::config.language_file :
|
||||
olive::runtime_config.external_translation_file;
|
||||
|
||||
// clear runtime language file so if the user sets a different language, we won't load it next time
|
||||
olive::CurrentRuntimeConfig.external_translation_file.clear();
|
||||
olive::runtime_config.external_translation_file.clear();
|
||||
|
||||
// remove current translation if there is one
|
||||
QApplication::removeTranslator(translator.get());
|
||||
@@ -195,7 +196,7 @@ void OliveGlobal::add_recent_project(const QString &url)
|
||||
}
|
||||
if (!found) {
|
||||
recent_projects.prepend(url);
|
||||
if (recent_projects.size() > olive::CurrentConfig.maximum_recent_projects) {
|
||||
if (recent_projects.size() > olive::config.maximum_recent_projects) {
|
||||
recent_projects.removeLast();
|
||||
}
|
||||
}
|
||||
@@ -229,6 +230,11 @@ const QString &OliveGlobal::recent_project(int index)
|
||||
return recent_projects.at(index);
|
||||
}
|
||||
|
||||
const QString &OliveGlobal::get_autorecovery_filename()
|
||||
{
|
||||
return autorecovery_filename;
|
||||
}
|
||||
|
||||
void OliveGlobal::LoadProject(const QString &fn, bool autorecovery)
|
||||
{
|
||||
// QSortFilterProxyModels are not thread-safe, and as we'll be loading in another thread, leaving it connected
|
||||
@@ -265,7 +271,7 @@ void OliveGlobal::ClearProject()
|
||||
panel_effect_controls->Clear(true);
|
||||
|
||||
// clear existing project
|
||||
set_sequence(nullptr);
|
||||
Timeline::CloseAll();
|
||||
panel_footage_viewer->set_media(nullptr);
|
||||
|
||||
// delete sequences first because it's important to close all the clips before deleting the media
|
||||
@@ -278,7 +284,7 @@ void OliveGlobal::ClearProject()
|
||||
olive::project_model.clear();
|
||||
|
||||
// clear undo stack
|
||||
olive::UndoStack.clear();
|
||||
olive::undo_stack.clear();
|
||||
|
||||
// empty current project filename
|
||||
update_project_filename("");
|
||||
@@ -308,36 +314,42 @@ void OliveGlobal::save_recent_projects()
|
||||
}
|
||||
}
|
||||
|
||||
void OliveGlobal::PasteInternal(Sequence *s)
|
||||
void OliveGlobal::PasteInternal(Sequence *s, bool insert)
|
||||
{
|
||||
if (s == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!olive::clipboard.IsEmpty()) {
|
||||
if (olive::clipboard.type() == Clipboard::CLIPBOARD_TYPE_CLIP) {
|
||||
ComboAction* ca = new ComboAction();
|
||||
|
||||
// create copies and delete areas that we'll be pasting to
|
||||
QVector<Selection> delete_areas;
|
||||
QVector<Clip*> original_clips;
|
||||
QVector<ClipPtr> pasted_clips;
|
||||
long paste_start = LONG_MAX;
|
||||
long paste_end = LONG_MIN;
|
||||
|
||||
for (int i=0;i<olive::clipboard.size();i++) {
|
||||
ClipPtr c = std::static_pointer_cast<Clip>(olive::clipboard.at(i));
|
||||
for (int i=0;i<olive::clipboard.Count();i++) {
|
||||
ClipPtr c = std::static_pointer_cast<Clip>(olive::clipboard.Get(i));
|
||||
|
||||
// create copy of clip and offset by playhead
|
||||
ClipPtr cc = c->copy(olive::ActiveSequence.get());
|
||||
ClipPtr cc = c->copy(s->GetTrackList(c->track()->type())->TrackAt(c->track()->Index()));
|
||||
|
||||
// convert frame rates
|
||||
cc->set_timeline_in(rescale_frame_number(cc->timeline_in(), c->cached_frame_rate(), olive::ActiveSequence->frame_rate));
|
||||
cc->set_timeline_out(rescale_frame_number(cc->timeline_out(), c->cached_frame_rate(), olive::ActiveSequence->frame_rate));
|
||||
cc->set_clip_in(rescale_frame_number(cc->clip_in(), c->cached_frame_rate(), olive::ActiveSequence->frame_rate));
|
||||
cc->set_timeline_in(rescale_frame_number(cc->timeline_in(), c->cached_frame_rate(), s->frame_rate));
|
||||
cc->set_timeline_out(rescale_frame_number(cc->timeline_out(), c->cached_frame_rate(), s->frame_rate));
|
||||
cc->set_clip_in(rescale_frame_number(cc->clip_in(), c->cached_frame_rate(), s->frame_rate));
|
||||
|
||||
cc->set_timeline_in(cc->timeline_in() + olive::ActiveSequence->playhead);
|
||||
cc->set_timeline_out(cc->timeline_out() + olive::ActiveSequence->playhead);
|
||||
cc->set_timeline_in(cc->timeline_in() + s->playhead);
|
||||
cc->set_timeline_out(cc->timeline_out() + s->playhead);
|
||||
cc->set_track(c->track());
|
||||
|
||||
paste_start = qMin(paste_start, cc->timeline_in());
|
||||
paste_end = qMax(paste_end, cc->timeline_out());
|
||||
|
||||
original_clips.append(c.get());
|
||||
pasted_clips.append(cc);
|
||||
|
||||
if (!insert) {
|
||||
@@ -345,52 +357,40 @@ void OliveGlobal::PasteInternal(Sequence *s)
|
||||
}
|
||||
}
|
||||
if (insert) {
|
||||
split_all_clips_at_point(ca, olive::ActiveSequence->playhead);
|
||||
ripple_clips(ca, olive::ActiveSequence.get(), paste_start, paste_end - paste_start);
|
||||
s->SplitAllClipsAtPoint(ca, s->playhead);
|
||||
s->Ripple(ca, paste_start, paste_end - paste_start);
|
||||
} else {
|
||||
delete_areas_and_relink(ca, delete_areas, false);
|
||||
s->DeleteAreas(ca, delete_areas, false);
|
||||
}
|
||||
|
||||
// correct linked clips
|
||||
for (int i=0;i<clipboard.size();i++) {
|
||||
// these indices should correspond
|
||||
ClipPtr oc = std::static_pointer_cast<Clip>(clipboard.at(i));
|
||||
olive::timeline::RelinkClips(original_clips, pasted_clips);
|
||||
|
||||
for (int j=0;j<oc->linked.size();j++) {
|
||||
for (int k=0;k<clipboard.size();k++) { // find clip with that ID
|
||||
ClipPtr comp = std::static_pointer_cast<Clip>(clipboard.at(k));
|
||||
if (comp->load_id == oc->linked.at(j)) {
|
||||
pasted_clips.at(i)->linked.append(k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ca->append(new AddClipCommand(pasted_clips));
|
||||
|
||||
ca->append(new AddClipCommand(olive::ActiveSequence.get(), pasted_clips));
|
||||
|
||||
olive::UndoStack.push(ca);
|
||||
olive::undo_stack.push(ca);
|
||||
|
||||
update_ui(true);
|
||||
|
||||
if (olive::CurrentConfig.paste_seeks) {
|
||||
if (olive::config.paste_seeks) {
|
||||
panel_sequence_viewer->seek(paste_end);
|
||||
}
|
||||
|
||||
} else if (clipboard_type == CLIPBOARD_TYPE_EFFECT) {
|
||||
} else if (olive::clipboard.type() == Clipboard::CLIPBOARD_TYPE_EFFECT) {
|
||||
ComboAction* ca = new ComboAction();
|
||||
|
||||
bool replace = false;
|
||||
bool skip = false;
|
||||
bool ask_conflict = true;
|
||||
|
||||
QVector<Clip*> selected_clips = olive::ActiveSequence->SelectedClips();
|
||||
QVector<Clip*> selected_clips = s->SelectedClips();
|
||||
|
||||
for (int i=0;i<selected_clips.size();i++) {
|
||||
Clip* c = selected_clips.at(i);
|
||||
|
||||
for (int j=0;j<clipboard.size();j++) {
|
||||
EffectPtr e = std::static_pointer_cast<Effect>(clipboard.at(j));
|
||||
if ((c->track() < 0) == (e->meta->subtype == EFFECT_TYPE_VIDEO)) {
|
||||
for (int j=0;j<olive::clipboard.Count();j++) {
|
||||
EffectPtr e = std::static_pointer_cast<Effect>(olive::clipboard.Get(j));
|
||||
if (c->type() == e->meta->subtype) {
|
||||
int found = -1;
|
||||
if (ask_conflict) {
|
||||
replace = false;
|
||||
@@ -403,7 +403,7 @@ void OliveGlobal::PasteInternal(Sequence *s)
|
||||
}
|
||||
}
|
||||
if (found >= 0 && ask_conflict) {
|
||||
QMessageBox box(this);
|
||||
QMessageBox box(olive::MainWindow);
|
||||
box.setWindowTitle(tr("Effect already exists"));
|
||||
box.setText(tr("Clip '%1' already contains a '%2' effect. "
|
||||
"Would you like to replace it with the pasted one or add it as a separate effect?")
|
||||
@@ -441,7 +441,7 @@ void OliveGlobal::PasteInternal(Sequence *s)
|
||||
}
|
||||
if (ca->hasActions()) {
|
||||
ca->appendPost(new ReloadEffectsCommand());
|
||||
olive::UndoStack.push(ca);
|
||||
olive::undo_stack.push(ca);
|
||||
} else {
|
||||
delete ca;
|
||||
}
|
||||
@@ -528,7 +528,7 @@ bool OliveGlobal::can_close_project() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void OliveGlobal::new_sequence()
|
||||
void OliveGlobal::open_new_sequence_dialog()
|
||||
{
|
||||
NewSequenceDialog nsd(olive::MainWindow);
|
||||
nsd.set_sequence_name(olive::project_model.GetNextSequenceName());
|
||||
@@ -557,7 +557,7 @@ void OliveGlobal::open_import_dialog()
|
||||
|
||||
void OliveGlobal::open_export_dialog() {
|
||||
if (CheckForActiveSequence()) {
|
||||
ExportDialog e(olive::MainWindow);
|
||||
ExportDialog e(olive::MainWindow, Timeline::GetTopSequence().get());
|
||||
e.exec();
|
||||
}
|
||||
}
|
||||
@@ -609,15 +609,10 @@ void OliveGlobal::open_preferences() {
|
||||
pd.exec();
|
||||
}
|
||||
|
||||
void OliveGlobal::set_sequence(SequencePtr s)
|
||||
void OliveGlobal::PrimarySequenceChanged()
|
||||
{
|
||||
panel_graph_editor->set_row(nullptr);
|
||||
panel_effect_controls->Clear(true);
|
||||
|
||||
olive::ActiveSequence = s;
|
||||
panel_sequence_viewer->set_main_sequence();
|
||||
panel_timeline->update_sequence();
|
||||
panel_timeline->setFocus();
|
||||
}
|
||||
|
||||
void OliveGlobal::clear_recent_projects()
|
||||
@@ -630,12 +625,12 @@ void OliveGlobal::OpenProjectWorker(QString fn, bool autorecovery) {
|
||||
ClearProject();
|
||||
update_project_filename(fn);
|
||||
LoadProject(fn, autorecovery);
|
||||
olive::UndoStack.clear();
|
||||
olive::undo_stack.clear();
|
||||
}
|
||||
|
||||
bool OliveGlobal::CheckForActiveSequence(bool show_msg)
|
||||
{
|
||||
if (olive::ActiveSequence == nullptr) {
|
||||
if (Timeline::GetTopSequence() == nullptr) {
|
||||
|
||||
if (show_msg) {
|
||||
QMessageBox::information(olive::MainWindow,
|
||||
@@ -651,30 +646,26 @@ bool OliveGlobal::CheckForActiveSequence(bool show_msg)
|
||||
|
||||
void OliveGlobal::undo() {
|
||||
// workaround to prevent crash (and also users should never need to do this)
|
||||
if (!panel_timeline->importing) {
|
||||
olive::UndoStack.undo();
|
||||
if (!Timeline::IsImporting()) {
|
||||
olive::undo_stack.undo();
|
||||
update_ui(true);
|
||||
}
|
||||
}
|
||||
|
||||
void OliveGlobal::redo() {
|
||||
// workaround to prevent crash (and also users should never need to do this)
|
||||
if (!panel_timeline->importing) {
|
||||
olive::UndoStack.redo();
|
||||
if (!Timeline::IsImporting()) {
|
||||
olive::undo_stack.redo();
|
||||
update_ui(true);
|
||||
}
|
||||
}
|
||||
|
||||
void OliveGlobal::paste() {
|
||||
if (olive::ActiveSequence != nullptr) {
|
||||
panel_timeline->paste(false);
|
||||
}
|
||||
PasteInternal(Timeline::GetTopSequence().get(), false);
|
||||
}
|
||||
|
||||
void OliveGlobal::paste_insert() {
|
||||
if (olive::ActiveSequence != nullptr) {
|
||||
panel_timeline->paste(true);
|
||||
}
|
||||
PasteInternal(Timeline::GetTopSequence().get(), true);
|
||||
}
|
||||
|
||||
void OliveGlobal::open_about_dialog() {
|
||||
@@ -687,9 +678,9 @@ void OliveGlobal::open_debug_log() {
|
||||
}
|
||||
|
||||
void OliveGlobal::open_speed_dialog() {
|
||||
if (olive::ActiveSequence != nullptr) {
|
||||
if (Timeline::GetTopSequence() != nullptr) {
|
||||
|
||||
QVector<Clip*> selected_clips = olive::ActiveSequence->SelectedClips();
|
||||
QVector<Clip*> selected_clips = Timeline::GetTopSequence()->SelectedClips();
|
||||
|
||||
if (!selected_clips.isEmpty()) {
|
||||
SpeedDialog s(olive::MainWindow, selected_clips);
|
||||
@@ -701,7 +692,7 @@ void OliveGlobal::open_speed_dialog() {
|
||||
void OliveGlobal::open_autocut_silence_dialog() {
|
||||
if (CheckForActiveSequence()) {
|
||||
|
||||
QVector<int> selected_clips = olive::ActiveSequence->SelectedClipIndexes();
|
||||
QVector<Clip*> selected_clips = Timeline::GetTopSequence()->SelectedClips();
|
||||
|
||||
if (selected_clips.isEmpty()) {
|
||||
QMessageBox::critical(olive::MainWindow,
|
||||
@@ -717,7 +708,7 @@ void OliveGlobal::open_autocut_silence_dialog() {
|
||||
}
|
||||
|
||||
void OliveGlobal::clear_undo_stack() {
|
||||
olive::UndoStack.clear();
|
||||
olive::undo_stack.clear();
|
||||
}
|
||||
|
||||
void OliveGlobal::open_action_search() {
|
||||
|
||||
+22
-27
@@ -204,6 +204,18 @@ public:
|
||||
*/
|
||||
const QString& get_autorecovery_filename();
|
||||
|
||||
/**
|
||||
* @brief Returns whether a Sequence is currently active or not, and optionally displays a messagebox if not
|
||||
*
|
||||
* Checks whether a Sequence is active and can display a messagebox if not to inform users to make one active in
|
||||
* order to perform said action.
|
||||
*
|
||||
* @return
|
||||
*
|
||||
* TRUE if there is an active Sequence, FALSE if not.
|
||||
*/
|
||||
bool CheckForActiveSequence(bool show_msg = true);
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* @brief Undo user's last action
|
||||
@@ -313,7 +325,7 @@ public slots:
|
||||
/**
|
||||
* @brief Opens the NewSequenceDialog to create a new Sequence
|
||||
*/
|
||||
void new_sequence();
|
||||
void open_new_sequence_dialog();
|
||||
|
||||
/**
|
||||
* @brief Open a file dialog for importing files into the project
|
||||
@@ -378,19 +390,6 @@ public slots:
|
||||
*/
|
||||
void open_preferences();
|
||||
|
||||
/**
|
||||
* @brief Set the current active Sequence
|
||||
*
|
||||
* Call this to change the active Sequence (e.g. when the user double clicks a Sequence in the Project panel).
|
||||
* This will affect panel_timeline, panel_sequence_viewer, and panel_effect_controls and can then be retrieved
|
||||
* using olive::ActiveSequence.
|
||||
*
|
||||
* @param s
|
||||
*
|
||||
* The Sequence to set as the active Sequence.
|
||||
*/
|
||||
void set_sequence(SequencePtr s);
|
||||
|
||||
/**
|
||||
* @brief Clear the recent projects list
|
||||
*
|
||||
@@ -398,6 +397,14 @@ public slots:
|
||||
*/
|
||||
void clear_recent_projects();
|
||||
|
||||
/**
|
||||
* @brief Slot for when the primary sequence has changed.
|
||||
*
|
||||
* Usually by opening a sequence or bringing a corresponding
|
||||
* Timeline widget on top.
|
||||
*/
|
||||
void PrimarySequenceChanged();
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief Internal function to handle loading a project from file
|
||||
@@ -417,18 +424,6 @@ private:
|
||||
*/
|
||||
void OpenProjectWorker(QString fn, bool autorecovery);
|
||||
|
||||
/**
|
||||
* @brief Returns whether a Sequence is currently active or not, and optionally displays a messagebox if not
|
||||
*
|
||||
* Checks whether a Sequence is active and can display a messagebox if not to inform users to make one active in
|
||||
* order to perform said action.
|
||||
*
|
||||
* @return
|
||||
*
|
||||
* TRUE if there is an active Sequence, FALSE if not.
|
||||
*/
|
||||
bool CheckForActiveSequence(bool show_msg = true);
|
||||
|
||||
/**
|
||||
* @brief Create a LoadDialog and start a LoadThread to load data from a project
|
||||
*
|
||||
@@ -475,7 +470,7 @@ private:
|
||||
/**
|
||||
* @brief Internal pasting function
|
||||
*/
|
||||
void PasteInternal(Sequence* s);
|
||||
void PasteInternal(Sequence* s, bool insert);
|
||||
|
||||
/**
|
||||
* @brief File filter used for any file dialogs relating to Olive project files.
|
||||
|
||||
@@ -41,4 +41,8 @@ QRect fit_size_into_rect(const QRect& r, int width, int height);
|
||||
double amplitude_to_db(double amplitude);
|
||||
double db_to_amplitude(double db);
|
||||
|
||||
// frame <-> pixel conversion functions
|
||||
int getScreenPointFromFrame(double zoom, long frame);
|
||||
long getFrameFromScreenPoint(double zoom, int x);
|
||||
|
||||
#endif // MATH_H
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
#include "global/config.h"
|
||||
|
||||
double get_timecode(Clip* c, long playhead) {
|
||||
return double(playhead_to_clip_frame(c, playhead))/c->sequence->frame_rate;
|
||||
return double(playhead_to_clip_frame(c, playhead))/c->track()->sequence()->frame_rate;
|
||||
}
|
||||
|
||||
long rescale_frame_number(long framenumber, double source_frame_rate, double target_frame_rate) {
|
||||
@@ -24,7 +24,7 @@ double playhead_to_clip_seconds(Clip* c, long playhead) {
|
||||
clip_frame = c->media_length() - clip_frame - 1;
|
||||
}
|
||||
|
||||
double secs = (double(clip_frame)/c->sequence->frame_rate)*c->speed().value;
|
||||
double secs = (double(clip_frame)/c->track()->sequence()->frame_rate)*c->speed().value;
|
||||
if (c->media() != nullptr && c->media()->get_type() == MEDIA_TYPE_FOOTAGE) {
|
||||
secs *= c->media()->to_footage()->speed;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user