Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
075a68b1
Commit
075a68b1
authored
Jun 28, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default fade duration is now configurable from Kdenlive Settings > Misc
parent
898d3ed9
Pipeline
#4708
passed with stage
in 13 minutes and 30 seconds
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
8 deletions
+32
-8
data/effects/fade_from_black.xml
data/effects/fade_from_black.xml
+1
-1
data/effects/fade_to_black.xml
data/effects/fade_to_black.xml
+1
-1
data/effects/fadein.xml
data/effects/fadein.xml
+1
-1
data/effects/fadeout.xml
data/effects/fadeout.xml
+1
-1
src/assets/model/assetparametermodel.cpp
src/assets/model/assetparametermodel.cpp
+3
-2
src/core.cpp
src/core.cpp
+6
-0
src/core.h
src/core.h
+2
-0
src/kdenlivesettings.kcfg
src/kdenlivesettings.kcfg
+5
-0
src/ui/configmisc_ui.ui
src/ui/configmisc_ui.ui
+12
-2
No files found.
data/effects/fade_from_black.xml
View file @
075a68b1
...
...
@@ -3,7 +3,7 @@
<name>
Fade from Black
</name>
<description>
Fade video from black
</description>
<author>
Charles Yates
</author>
<parameter
type=
"position"
name=
"out"
max=
"90000"
min=
"0"
default=
"
75
"
>
<parameter
type=
"position"
name=
"out"
max=
"90000"
min=
"0"
default=
"
%fade
"
>
<name>
Duration
</name>
</parameter>
<parameter
type=
"fixed"
name=
"in"
max=
"0"
min=
"0"
default=
"0"
>
...
...
data/effects/fade_to_black.xml
View file @
075a68b1
...
...
@@ -3,7 +3,7 @@
<name>
Fade to Black
</name>
<description>
Fade video to black
</description>
<author>
Charles Yates
</author>
<parameter
type=
"position"
name=
"in"
max=
"0"
min=
"0"
default=
"-
75
"
>
<parameter
type=
"position"
name=
"in"
max=
"0"
min=
"0"
default=
"-
%fade
"
>
<name>
Duration
</name>
</parameter>
<parameter
type=
"fixed"
name=
"out"
max=
"99999"
min=
"0"
default=
"%out"
>
...
...
data/effects/fadein.xml
View file @
075a68b1
...
...
@@ -6,7 +6,7 @@
<parameter
type=
"fixed"
name=
"in"
max=
"0"
min=
"0"
default=
"0"
>
<name></name>
</parameter>
<parameter
type=
"position"
name=
"out"
max=
"90000"
min=
"0"
default=
"
75
"
>
<parameter
type=
"position"
name=
"out"
max=
"90000"
min=
"0"
default=
"
%fade
"
>
<name>
Duration
</name>
</parameter>
<parameter
type=
"fixed"
name=
"gain"
max=
"0"
min=
"0"
default=
"0"
>
...
...
data/effects/fadeout.xml
View file @
075a68b1
...
...
@@ -3,7 +3,7 @@
<name>
Fade out
</name>
<description>
Fade out audio track
</description>
<author></author>
<parameter
type=
"position"
name=
"in"
max=
"0"
min=
"0"
default=
"-
75
"
>
<parameter
type=
"position"
name=
"in"
max=
"0"
min=
"0"
default=
"-
%fade
"
>
<name>
Duration
</name>
</parameter>
<parameter
type=
"fixed"
name=
"out"
max=
"90000"
min=
"0"
default=
"%out"
>
...
...
src/assets/model/assetparametermodel.cpp
View file @
075a68b1
...
...
@@ -513,13 +513,14 @@ QVariant AssetParameterModel::parseAttribute(const ObjectId &owner, const QStrin
int
height
=
profile
->
height
();
int
in
=
pCore
->
getItemIn
(
owner
);
int
out
=
in
+
pCore
->
getItemDuration
(
owner
);
int
frame_duration
=
pCore
->
getDurationFromString
(
KdenliveSettings
::
fade_duration
());
// replace symbols in the double parameter
content
.
replace
(
QLatin1String
(
"%maxWidth"
),
QString
::
number
(
width
))
.
replace
(
QLatin1String
(
"%maxHeight"
),
QString
::
number
(
height
))
.
replace
(
QLatin1String
(
"%width"
),
QString
::
number
(
width
))
.
replace
(
QLatin1String
(
"%height"
),
QString
::
number
(
height
))
.
replace
(
QLatin1String
(
"%out"
),
QString
::
number
(
out
));
.
replace
(
QLatin1String
(
"%out"
),
QString
::
number
(
out
))
.
replace
(
QLatin1String
(
"%fade"
),
QString
::
number
(
frame_duration
));
if
(
type
==
ParamType
::
Double
||
type
==
ParamType
::
Hidden
)
{
// Use a Mlt::Properties to parse mathematical operators
...
...
src/core.cpp
View file @
075a68b1
...
...
@@ -752,3 +752,9 @@ QString Core::getTimelineClipBinId(int cid)
}
return
QString
();
}
int
Core
::
getDurationFromString
(
const
QString
&
time
)
{
const
QString
duration
=
currentDoc
()
->
timecode
().
reformatSeparators
(
time
);
return
currentDoc
()
->
timecode
().
getFrameCount
(
duration
);
}
src/core.h
View file @
075a68b1
...
...
@@ -195,6 +195,8 @@ public:
QString
getProjectFolderName
();
/** @brief Returns a timeline clip's bin id */
QString
getTimelineClipBinId
(
int
cid
);
/** @brief Returns a frame duration from a timecode */
int
getDurationFromString
(
const
QString
&
time
);
private:
explicit
Core
();
...
...
src/kdenlivesettings.kcfg
View file @
075a68b1
...
...
@@ -62,6 +62,11 @@
<label>
Default image sequence frame duration.
</label>
<default>
00:00:00:01
</default>
</entry>
<entry
name=
"fade_duration"
type=
"String"
>
<label>
Default image sequence frame duration.
</label>
<default>
00:00:03:00
</default>
</entry>
<entry
name=
"autoimagesequence"
type=
"Bool"
>
<label>
Automatically import image sequences.
</label>
...
...
src/ui/configmisc_ui.ui
View file @
075a68b1
...
...
@@ -6,8 +6,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
4
14
</width>
<height>
546
</height>
<width>
7
14
</width>
<height>
771
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
...
...
@@ -95,6 +95,16 @@
</property>
</widget>
</item>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QLabel"
name=
"label_6"
>
<property
name=
"text"
>
<string>
Fades
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"3"
>
<widget
class=
"QLineEdit"
name=
"kcfg_fade_duration"
/>
</item>
</layout>
</widget>
</item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment