Commit 897371d7 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents e48041f4 0491ae3a
Pipeline #62456 passed with stage
in 12 minutes and 5 seconds
......@@ -60,6 +60,7 @@ frei0r_equaliz0r.xml
frei0r_facebl0r.xml
frei0r_facedetect.xml
frei0r_flippo.xml
frei0r_glitch0r.xml
frei0r_glow.xml
frei0r_hqdn3d.xml
frei0r_hueshift0r.xml
......@@ -110,6 +111,7 @@ lift_gamma_gain.xml
lightshow.xml
loudness.xml
luma.xml
lumaliftgaingamma.xml
mirror.xml
mono.xml
movit_blur.xml
......
......@@ -3,16 +3,16 @@
<name>Charcoal</name>
<description>Charcoal drawing effect</description>
<author>Charles Yates</author>
<parameter type="constant" name="x_scatter" max="10" min="0" default="2">
<parameter type="animated" name="x_scatter" max="10" min="0" default="2">
<name>Horizontal scatter</name>
</parameter>
<parameter type="constant" name="y_scatter" max="10" min="0" default="2">
<parameter type="animated" name="y_scatter" max="10" min="0" default="2">
<name>Vertical scatter</name>
</parameter>
<parameter type="constant" name="scale" max="10" min="0" default="1">
<parameter type="animated" name="scale" max="10" min="0" default="1">
<name>Scale</name>
</parameter>
<parameter type="constant" name="mix" max="10" min="0" default="0">
<parameter type="animated" name="mix" max="10" min="0" default="0">
<name>Mix</name>
</parameter>
<parameter type="bool" name="invert" default="0">
......
......@@ -3,10 +3,10 @@
<name>Dust</name>
<description>Add dust and specks to the video, as in old movies</description>
<author>Marco Gittler</author>
<parameter type="double" name="maxdiameter" max="100" min="0" default="2" suffix="%">
<parameter type="animated" name="maxdiameter" max="100" min="0" default="2" suffix="%">
<name>Maximal Diameter</name>
</parameter>
<parameter type="double" name="maxcount" max="400" min="0" default="10">
<parameter type="animated" name="maxcount" max="400" min="0" default="10">
<name>Maximal number of dust</name>
</parameter>
</effect>
<!DOCTYPE kpartgui>
<effect tag="frei0r.glitch0r" id="frei0r.glitch0r" type="video">
<name>Glitch0r</name>
<description>Adds glitches and block shifting</description>
<author>IDENT Software</author>
<parameter type="animated" name="0" max="1000" min="0" default="0" factor="1000">
<name>Glitch frequency</name>
</parameter>
<parameter type="animated" name="1" max="1000" min="0" default="0.49913" factor="1000">
<name>Block height</name>
</parameter>
<parameter type="animated" name="2" max="1000" min="0" default="0.499305" factor="1000">
<name>Shift intensity</name>
</parameter>
<parameter type="animated" name="3" max="1000" min="0" default="0" factor="1000">
<name>Color glitching intensity</name>
</parameter>
</effect>
<!DOCTYPE kpartgui>
<effect tag="lumaliftgaingamma" id="lumaliftgaingamma">
<name>LumaLiftGainGamma</name>
<description>Filter can be used to apply lift, gain and gamma correction to luma values of image.</description>
<author>Janne Liljeblad</author>
<parameter type="animated" name="lift" max="500" min="-500" default="0" factor="1000">
<name>Lift</name>
</parameter>
<parameter type="animated" name="gain" max="500" min="-500" default="0" factor="1000">
<name>Gain</name>
</parameter>
<parameter type="animated" name="gamma" max="1000" min="-1000" default="0" factor="1000">
<name>Gamma</name>
</parameter>
</effect>
......@@ -3,28 +3,28 @@
<name>Oldfilm</name>
<description>Moves the Picture up and down and random brightness change</description>
<author>Marco Gittler</author>
<parameter type="double" name="delta" max="400" min="0" default="14">
<parameter type="animated" name="delta" max="400" min="0" default="14">
<name>Y-Delta</name>
</parameter>
<parameter type="double" name="every" max="100" min="0" default="20" suffix="%">
<parameter type="animated" name="every" max="100" min="0" default="20" suffix="%">
<name>% of picture have a delta</name>
</parameter>
<parameter type="double" name="brightnessdelta_up" max="100" min="0" default="20">
<parameter type="animated" name="brightnessdelta_up" max="100" min="0" default="20">
<name>Brightness up</name>
</parameter>
<parameter type="double" name="brightnessdelta_down" max="100" min="0" default="30">
<parameter type="animated" name="brightnessdelta_down" max="100" min="0" default="30">
<name>Brightness down</name>
</parameter>
<parameter type="double" name="brightnessdelta_every" max="100" min="0" default="70" suffix="%">
<parameter type="animated" name="brightnessdelta_every" max="100" min="0" default="70" suffix="%">
<name>Brightness every</name>
</parameter>
<parameter type="double" name="unevendevelop_up" max="100" min="0" default="60">
<parameter type="animated" name="unevendevelop_up" max="100" min="0" default="60">
<name>Unevendevelop up</name>
</parameter>
<parameter type="double" name="unevendevelop_down" max="100" min="0" default="20">
<parameter type="animated" name="unevendevelop_down" max="100" min="0" default="20">
<name>Unevendevelop down</name>
</parameter>
<parameter type="double" name="unevendevelop_duration" max="10000" min="0" default="70">
<parameter type="animated" name="unevendevelop_duration" max="10000" min="0" default="70">
<name>Unevendevelop Duration</name>
</parameter>
</effect>
......@@ -3,16 +3,16 @@
<name>Scratchlines</name>
<description>Scratchlines over the picture</description>
<author>Marco Gittler</author>
<parameter type="double" name="line_width" max="100" min="0" default="2">
<parameter type="animated" name="line_width" max="100" min="0" default="2">
<name>Width of line</name>
</parameter>
<parameter type="double" name="num" max="100" min="0" default="5">
<parameter type="animated" name="num" max="100" min="0" default="5">
<name>Max number of lines</name>
</parameter>
<parameter type="double" name="darker" max="100" min="0" default="40">
<parameter type="animated" name="darker" max="100" min="0" default="40">
<name>Max darker</name>
</parameter>
<parameter type="double" name="lighter" max="100" min="0" default="40">
<parameter type="animated" name="lighter" max="100" min="0" default="40">
<name>Max lighter</name>
</parameter>
</effect>
......@@ -3,10 +3,10 @@
<name>Technicolor</name>
<description>Oversaturate the color in video, like in old Technicolor movies</description>
<author>Marco Gittler</author>
<parameter type="double" name="oversaturate_cr" max="400" min="-400" default="190">
<parameter type="animated" name="oversaturate_cr" max="400" min="-400" default="190">
<name>Blue/Yellow axis</name>
</parameter>
<parameter type="double" name="oversaturate_cb" max="400" min="-400" default="190">
<parameter type="animated" name="oversaturate_cb" max="400" min="-400" default="190">
<name>Red/Green axis</name>
</parameter>
</effect>
......@@ -3,7 +3,7 @@
<name>Binarize</name>
<description>Make monochrome clip</description>
<author>Charles Yates</author>
<parameter type="constant" name="midpoint" max="255" min="0" default="128">
<parameter type="animated" name="midpoint" max="255" min="0" default="128">
<name>Threshold value</name>
</parameter>
<parameter type="bool" name="use_alpha" default="0">
......
......@@ -429,7 +429,7 @@ QVariant AssetParameterModel::data(const QModelIndex &index, int role) const
return comment;
}
case InRole:
return m_asset->get_int("in");
return pCore->getItemIn(m_ownerId);
case OutRole:
return m_asset->get_int("out");
case ParentInRole:
......
......@@ -202,7 +202,7 @@ const QString ProfileRepository::saveProfile(ProfileInfo *profile, QString profi
profilePath.clear();
}
file.close();
refresh(false);
refresh(true);
return profilePath;
}
......
......@@ -79,7 +79,7 @@ void TransitionStackView::setModel(const std::shared_ptr<AssetParameterModel> &m
connect(m_trackBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTrack(int)));
connect(this, &AssetParameterView::seekToPos, [this](int pos) {
// at this point, the effects returns a pos relative to the clip. We need to convert it to a global time
int clipIn = 0;//pCore->getItemPosition(m_model->getOwnerId());
int clipIn = pCore->getItemPosition(m_model->getOwnerId());
emit seekToTransPos(pos + clipIn);
});
emit initKeyframeView(true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment