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
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
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
8e3163b2
Commit
8e3163b2
authored
Oct 20, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix playlist clips have no audio regression.
Fixes
#816
parent
ed5e0ed3
Pipeline
#38176
canceled with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
src/lib/audio/audioStreamInfo.cpp
src/lib/audio/audioStreamInfo.cpp
+5
-1
src/lib/audio/audioStreamInfo.h
src/lib/audio/audioStreamInfo.h
+1
-1
src/mltcontroller/clipcontroller.cpp
src/mltcontroller/clipcontroller.cpp
+1
-1
No files found.
src/lib/audio/audioStreamInfo.cpp
View file @
8e3163b2
...
...
@@ -16,7 +16,7 @@ the Free Software Foundation, either version 3 of the License, or
#include <QString>
#include <cstdlib>
AudioStreamInfo
::
AudioStreamInfo
(
const
std
::
shared_ptr
<
Mlt
::
Producer
>
&
producer
,
int
audioStreamIndex
)
AudioStreamInfo
::
AudioStreamInfo
(
const
std
::
shared_ptr
<
Mlt
::
Producer
>
&
producer
,
int
audioStreamIndex
,
bool
playlist
)
:
m_audioStreamIndex
(
audioStreamIndex
)
,
m_ffmpegAudioIndex
(
0
)
,
m_samplingRate
(
48000
)
...
...
@@ -25,6 +25,10 @@ AudioStreamInfo::AudioStreamInfo(const std::shared_ptr<Mlt::Producer> &producer,
{
// Fetch audio streams
int
streams
=
producer
->
get_int
(
"meta.media.nb_streams"
);
if
(
playlist
)
{
// Playlist clips do not provide stream info
m_audioStreams
.
insert
(
0
,
i18n
(
"Audio"
));
}
int
streamIndex
=
1
;
for
(
int
ix
=
0
;
ix
<
streams
;
ix
++
)
{
char
property
[
200
];
...
...
src/lib/audio/audioStreamInfo.h
View file @
8e3163b2
...
...
@@ -23,7 +23,7 @@ class AudioStreamInfo
{
public:
// TODO make that access a shared ptr instead of raw
AudioStreamInfo
(
const
std
::
shared_ptr
<
Mlt
::
Producer
>
&
producer
,
int
audioStreamIndex
);
AudioStreamInfo
(
const
std
::
shared_ptr
<
Mlt
::
Producer
>
&
producer
,
int
audioStreamIndex
,
bool
playlist
=
false
);
~
AudioStreamInfo
();
int
samplingRate
()
const
;
...
...
src/mltcontroller/clipcontroller.cpp
View file @
8e3163b2
...
...
@@ -262,7 +262,7 @@ void ClipController::getInfoForProducer()
m_clipType
=
ClipType
::
Unknown
;
}
if
(
audioIndex
>
-
1
||
m_clipType
==
ClipType
::
Playlist
)
{
m_audioInfo
=
std
::
make_unique
<
AudioStreamInfo
>
(
m_masterProducer
,
audioIndex
);
m_audioInfo
=
std
::
make_unique
<
AudioStreamInfo
>
(
m_masterProducer
,
audioIndex
,
true
);
// Load stream effects
for
(
int
stream
:
m_audioInfo
->
streams
().
keys
())
{
QString
streamEffect
=
m_properties
->
get
(
QString
(
"kdenlive:stream:%1"
).
arg
(
stream
).
toUtf8
().
constData
());
...
...
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