Skip to content
GitLab
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
0b6b41bc
Commit
0b6b41bc
authored
Feb 14, 2020
by
Yuri Chornoivan
Browse files
Fix minor EBN issues
parent
774c3aef
Pipeline
#15050
passed with stage
in 17 minutes and 26 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
packaging/appimage/3rdparty/ext_applications/CMakeLists.txt
View file @
0b6b41bc
...
...
@@ -42,4 +42,4 @@ ExternalProject_Add(
CMAKE_ARGS
${
CMAKE_GLOBAL_PROFILE
}
DEPENDS ext_kcoreaddons ext_ki18n ext_kconfig ext_kcodecs
)
\ No newline at end of file
)
src/audiomixer/mixerwidget.cpp
View file @
0b6b41bc
...
...
@@ -142,7 +142,7 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
setFont
(
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
));
// Build audio meter widget
m_audioMeterWidget
.
reset
(
new
AudioLevelWidget
(
width
(),
this
));
// intialize for stereo display
// in
i
tialize for stereo display
m_audioMeterWidget
->
setAudioValues
({
-
100
,
-
100
});
// Build volume widget
...
...
src/bin/projectclip.h
View file @
0b6b41bc
...
...
@@ -207,7 +207,7 @@ public:
use. If yes, then we must create a new one, because of the mixing bug. In any case, we return a cut of the master that can be used in the timeline The
bool returned has the following sementic:
- if true, then the returned cut still possibly has effect on it. You need to rebuild the effectStack based on this
- if false, the the returned cut don't have effects anymore (it's a fresh one), so you need to reload effects from the old producer
- if false, the
n
the returned cut don't have effects anymore (it's a fresh one), so you need to reload effects from the old producer
*/
std
::
pair
<
std
::
shared_ptr
<
Mlt
::
Producer
>
,
bool
>
giveMasterAndGetTimelineProducer
(
int
clipId
,
std
::
shared_ptr
<
Mlt
::
Producer
>
master
,
PlaylistState
::
ClipState
state
);
...
...
src/core.h
View file @
0b6b41bc
...
...
@@ -201,7 +201,7 @@ public:
QString
getTimelineClipBinId
(
int
cid
);
/** @brief Returns a frame duration from a timecode */
int
getDurationFromString
(
const
QString
&
time
);
/** @brief An error occured within a filter, inform user */
/** @brief An error occur
r
ed within a filter, inform user */
void
processInvalidFilter
(
const
QString
service
,
const
QString
id
,
const
QString
message
);
/** @brief Update current project's tags */
void
updateProjectTags
(
QMap
<
QString
,
QString
>
tags
);
...
...
src/effects/effectstack/model/effectstackmodel.cpp
View file @
0b6b41bc
...
...
@@ -786,7 +786,7 @@ void EffectStackModel::moveEffect(int destRow, const std::shared_ptr<AbstractEff
update
();
UPDATE_UNDO_REDO
(
update
,
update
,
undo
,
redo
);
auto
effectId
=
std
::
static_pointer_cast
<
EffectItemModel
>
(
item
)
->
getAssetId
();
PUSH_UNDO
(
undo
,
redo
,
i18n
(
"Move effect %1"
).
arg
(
EffectsRepository
::
get
()
->
getName
(
effectId
)));
PUSH_UNDO
(
undo
,
redo
,
i18n
(
"Move effect %1"
,
EffectsRepository
::
get
()
->
getName
(
effectId
)));
}
}
...
...
src/lib/audio/fftCorrelation.cpp
View file @
0b6b41bc
...
...
@@ -15,7 +15,6 @@ extern "C" {
}
#include
"kdenlive_debug.h"
#include
<QElapsedTimer>
#include
<algorithm>
#include
<vector>
...
...
src/utils/thememanager.cpp
View file @
0b6b41bc
...
...
@@ -82,7 +82,7 @@ QString ThemeManager::loadCurrentScheme() const
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 67, 0)
// Since 5.67 KColorSchemeManager includes a system color scheme option that reacts to system
// scheme changes. This scheme will be activated if we pass an empty string to KColorSchemeManager
// So no need anymore to read the
the
current global scheme ourselves if no custom one is configured.
// So no need anymore to read the current global scheme ourselves if no custom one is configured.
return
cg
.
readEntry
(
"ColorScheme"
);
#else
return
cg
.
readEntry
(
"ColorScheme"
,
currentDesktopDefaultScheme
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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