Skip to content

Save animIn and animOut as time instead of frames #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddennedy merged 1 commit into from
Jul 27, 2018
Merged

Save animIn and animOut as time instead of frames #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/qmltypes/qmlfilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,15 +416,25 @@ void QmlFilter::setOut(int value)
set("out", value);
}

int QmlFilter::animateIn()
{
return m_filter.time_to_frames(m_filter.get(kShotcutAnimInProperty));
}

void QmlFilter::setAnimateIn(int value)
{
m_filter.set(kShotcutAnimInProperty, value);
m_filter.set(kShotcutAnimInProperty, m_filter.frames_to_time(value, mlt_time_clock));
emit animateInChanged();
}

int QmlFilter::animateOut()
{
return m_filter.time_to_frames(m_filter.get(kShotcutAnimOutProperty));
}

void QmlFilter::setAnimateOut(int value)
{
m_filter.set(kShotcutAnimOutProperty, value);
m_filter.set(kShotcutAnimOutProperty, m_filter.frames_to_time(value, mlt_time_clock));
emit animateOutChanged();
}

Expand Down
4 changes: 2 additions & 2 deletions src/qmltypes/qmlfilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ class QmlFilter : public QObject
int out();
void setOut(int value);
Mlt::Filter& filter() { return m_filter; }
int animateIn() { return m_filter.get_int(kShotcutAnimInProperty); }
int animateIn();
void setAnimateIn(int value);
int animateOut() { return m_filter.get_int(kShotcutAnimOutProperty); }
int animateOut();
void setAnimateOut(int value);
int duration();
Q_INVOKABLE void resetProperty(const QString& name);
Expand Down