Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
luyikei
VLMC
Commits
9022c329
Commit
9022c329
authored
Aug 08, 2017
by
luyikei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SequenceWorkflow: Use unique_ptr for m_multitrack
parent
1b9b2e13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/Workflow/SequenceWorkflow.cpp
src/Workflow/SequenceWorkflow.cpp
+2
-3
src/Workflow/SequenceWorkflow.h
src/Workflow/SequenceWorkflow.h
+1
-1
No files found.
src/Workflow/SequenceWorkflow.cpp
View file @
9022c329
...
...
@@ -60,7 +60,6 @@ SequenceWorkflow::SequenceWorkflow( size_t trackCount )
SequenceWorkflow
::~
SequenceWorkflow
()
{
delete
m_multitrack
;
clear
();
}
...
...
@@ -277,7 +276,7 @@ SequenceWorkflow::loadFromVariant( const QVariant& variant )
EffectHelper
::
loadFromVariant
(
m
[
"filters"
],
clip
->
input
()
);
}
EffectHelper
::
loadFromVariant
(
variant
.
toMap
()[
"filters"
],
m_multitrack
);
EffectHelper
::
loadFromVariant
(
variant
.
toMap
()[
"filters"
],
m_multitrack
.
get
()
);
}
void
...
...
@@ -317,7 +316,7 @@ SequenceWorkflow::position( const QUuid& uuid )
Backend
::
IInput
*
SequenceWorkflow
::
input
()
{
return
m_multitrack
;
return
m_multitrack
.
get
()
;
}
Backend
::
IInput
*
...
...
src/Workflow/SequenceWorkflow.h
View file @
9022c329
...
...
@@ -119,9 +119,9 @@ class SequenceWorkflow : public QObject
QMap
<
QUuid
,
QSharedPointer
<
ClipInstance
>>
m_clips
;
Backend
::
IMultiTrack
*
m_multitrack
;
QList
<
QSharedPointer
<
Track
>>
m_tracks
[
Workflow
::
NbTrackType
];
QList
<
std
::
shared_ptr
<
Backend
::
IMultiTrack
>>
m_multiTracks
;
std
::
unique_ptr
<
Backend
::
IMultiTrack
>
m_multitrack
;
const
size_t
m_trackCount
;
signals:
...
...
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