Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
fd8e513f
Commit
fd8e513f
authored
Jun 09, 2020
by
Simon Eugster
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix other builds
parent
b4128552
Pipeline
#23027
passed with stage
in 15 minutes and 20 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
13 deletions
+9
-13
renderer/CMakeLists.txt
renderer/CMakeLists.txt
+1
-0
renderer/kdenlive_render.cpp
renderer/kdenlive_render.cpp
+0
-5
tests/compositiontest.cpp
tests/compositiontest.cpp
+5
-5
tests/modeltest.cpp
tests/modeltest.cpp
+2
-2
thumbnailer/CMakeLists.txt
thumbnailer/CMakeLists.txt
+1
-1
No files found.
renderer/CMakeLists.txt
View file @
fd8e513f
...
...
@@ -9,6 +9,7 @@ include_directories(
set
(
kdenlive_render_SRCS
kdenlive_render.cpp
renderjob.cpp
../src/lib/localeHandling.cpp
)
add_executable
(
kdenlive_render
${
kdenlive_render_SRCS
}
)
...
...
renderer/kdenlive_render.cpp
View file @
fd8e513f
...
...
@@ -23,11 +23,6 @@
#include <QApplication>
#include <QDir>
#include <QDomDocument>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QtGlobal>
#include <cstdio>
int
main
(
int
argc
,
char
**
argv
)
{
...
...
tests/compositiontest.cpp
View file @
fd8e513f
...
...
@@ -29,13 +29,13 @@ TEST_CASE("Basic creation/deletion of a composition", "[CompositionModel]")
std
::
shared_ptr
<
TimelineItemModel
>
timeline
=
TimelineItemModel
::
construct
(
&
profile_composition
,
guideModel
,
undoStack
);
REQUIRE
(
timeline
->
getCompositionsCount
()
==
0
);
int
id1
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
id1
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
REQUIRE
(
timeline
->
getCompositionsCount
()
==
1
);
int
id2
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
id2
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
REQUIRE
(
timeline
->
getCompositionsCount
()
==
2
);
int
id3
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
id3
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
REQUIRE
(
timeline
->
getCompositionsCount
()
==
3
);
// Test deletion
...
...
@@ -58,11 +58,11 @@ TEST_CASE("Composition manipulation", "[CompositionModel]")
int
tid0
=
TrackModel
::
construct
(
timeline
);
Q_UNUSED
(
tid0
);
int
tid1
=
TrackModel
::
construct
(
timeline
);
int
cid2
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
cid2
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
int
tid2
=
TrackModel
::
construct
(
timeline
);
int
tid3
=
TrackModel
::
construct
(
timeline
);
Q_UNUSED
(
tid3
);
int
cid1
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
cid1
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
REQUIRE
(
timeline
->
getCompositionPlaytime
(
cid1
)
==
1
);
REQUIRE
(
timeline
->
getCompositionPlaytime
(
cid2
)
==
1
);
...
...
tests/modeltest.cpp
View file @
fd8e513f
...
...
@@ -1952,7 +1952,7 @@ TEST_CASE("Operations under locked tracks", "[Locked]")
}
SECTION
(
"Can't move composition on locked track"
)
{
int
compo
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
compo
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
timeline
->
setTrackLockedState
(
tid1
,
true
);
REQUIRE
(
timeline
->
getTrackById
(
tid1
)
->
isLocked
());
REQUIRE
(
timeline
->
checkConsistency
());
...
...
@@ -2025,7 +2025,7 @@ TEST_CASE("Operations under locked tracks", "[Locked]")
}
SECTION
(
"Can't resize composition on locked track"
)
{
int
compo
=
CompositionModel
::
construct
(
timeline
,
aCompo
);
int
compo
=
CompositionModel
::
construct
(
timeline
,
aCompo
,
QString
()
);
REQUIRE
(
timeline
->
requestCompositionMove
(
compo
,
tid1
,
2
));
REQUIRE
(
timeline
->
requestItemResize
(
compo
,
20
,
true
)
==
20
);
...
...
thumbnailer/CMakeLists.txt
View file @
fd8e513f
set
(
mltpreview_SRCS mltpreview.cpp
)
set
(
mltpreview_SRCS mltpreview.cpp
../src/lib/localeHandling.cpp
)
include_directories
(
${
MLT_INCLUDE_DIR
}
...
...
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