Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
9c542453
Commit
9c542453
authored
Oct 30, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix some compositions appearing twice. Related to
#414
parent
dc1fe1eb
Pipeline
#9719
passed with stage
in 13 minutes and 20 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/abstractassetsrepository.ipp
View file @
9c542453
...
...
@@ -274,7 +274,7 @@ template <typename AssetType> QVector<QPair<QString, QString>> AbstractAssetsRep
QVector<QPair<QString, QString>> res;
res.reserve((int)m_assets.size());
for (const auto &asset : m_assets) {
if (!KdenliveSettings::gpu_accel() && asset.first.contains(QLatin1String("movit."))) {
if
(((int) (asset.second.type) == -1) ||
(!KdenliveSettings::gpu_accel() && asset.first.contains(QLatin1String("movit.")))
)
{
// Hide GPU effects/compositions when movit disabled
continue;
}
...
...
src/effects/effectsrepository.hpp
View file @
9c542453
...
...
@@ -33,7 +33,7 @@
* Note that this class is a Singleton
*/
enum
class
EffectType
{
Preferred
,
Video
,
Audio
,
Custom
,
CustomAudio
,
Favorites
,
Hidden
};
enum
class
EffectType
{
Preferred
,
Video
,
Audio
,
Custom
,
CustomAudio
,
Favorites
,
Hidden
=
-
1
};
Q_DECLARE_METATYPE
(
EffectType
)
class
EffectsRepository
:
public
AbstractAssetsRepository
<
EffectType
>
...
...
src/transitions/transitionsrepository.hpp
View file @
9c542453
...
...
@@ -33,7 +33,7 @@
* Note that this class is a Singleton
*/
enum
class
TransitionType
{
AudioComposition
,
VideoComposition
,
AudioTransition
,
VideoTransition
,
Favorites
,
Hidden
};
enum
class
TransitionType
{
AudioComposition
,
VideoComposition
,
AudioTransition
,
VideoTransition
,
Favorites
,
Hidden
=
-
1
};
Q_DECLARE_METATYPE
(
TransitionType
)
class
TransitionsRepository
:
public
AbstractAssetsRepository
<
TransitionType
>
...
...
Write
Preview
Supports
Markdown
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