Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
a23337f9
Commit
a23337f9
authored
Aug 12, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The workflow now takes care of the begin and end of the clip
parent
1083dd76
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
src/Library.cpp
src/Library.cpp
+1
-1
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+0
-1
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+3
-0
No files found.
src/Library.cpp
View file @
a23337f9
...
...
@@ -58,7 +58,7 @@ void Library::removingMediaAsked( const QUuid& uuid )
void
Library
::
metaDataComputed
(
Media
*
media
)
{
Clip
*
clip
=
new
Clip
(
media
,
0.
5
f
,
1.0
f
);
Clip
*
clip
=
new
Clip
(
media
,
0.
0
f
,
0.5
f
);
m_clips
[
clip
->
getUuid
()]
=
clip
;
emit
newClipLoaded
(
clip
);
}
...
...
src/Workflow/ClipWorkflow.cpp
View file @
a23337f9
...
...
@@ -91,7 +91,6 @@ void ClipWorkflow::lock( ClipWorkflow* cw, void** pp_ret )
// else
// {
*
pp_ret
=
cw
->
m_buffer
;
// qDebug() << "Clip workflow locking <<<<<<<<<<<<<<<<<<<<<<<<<<";
// }
}
...
...
src/Workflow/TrackWorkflow.cpp
View file @
a23337f9
...
...
@@ -120,6 +120,7 @@ unsigned char* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentF
if
(
needRepositioning
==
true
)
{
float
pos
=
(
(
float
)(
currentFrame
-
start
)
/
(
float
)(
cw
->
getClip
()
->
getLength
())
);
pos
=
pos
*
(
cw
->
getClip
()
->
getEnd
()
-
cw
->
getClip
()
->
getBegin
()
)
+
cw
->
getClip
()
->
getBegin
();
cw
->
setPosition
(
pos
);
}
ret
=
cw
->
getOutput
();
...
...
@@ -142,6 +143,7 @@ unsigned char* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentF
if
(
start
!=
currentFrame
)
//Clip was not started as its real begining
{
float
pos
=
(
(
float
)(
currentFrame
-
start
)
/
(
float
)(
cw
->
getClip
()
->
getLength
())
);
pos
=
pos
*
(
cw
->
getClip
()
->
getEnd
()
-
cw
->
getClip
()
->
getBegin
()
)
+
cw
->
getClip
()
->
getBegin
();
cw
->
setPosition
(
pos
);
}
}
...
...
@@ -155,6 +157,7 @@ unsigned char* TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentF
if
(
needRepositioning
==
true
)
{
float
pos
=
(
(
float
)(
currentFrame
-
start
)
/
(
float
)(
cw
->
getClip
()
->
getLength
())
);
pos
=
pos
*
(
cw
->
getClip
()
->
getEnd
()
-
cw
->
getClip
()
->
getBegin
()
)
+
cw
->
getClip
()
->
getBegin
();
cw
->
setPosition
(
pos
);
}
}
...
...
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