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
b68959f3
Commit
b68959f3
authored
May 28, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing a bug introduced in last commit.
parent
451be079
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+3
-7
src/Workflow/TrackWorkflow.h
src/Workflow/TrackWorkflow.h
+5
-0
No files found.
src/Workflow/TrackWorkflow.cpp
View file @
b68959f3
...
...
@@ -93,6 +93,7 @@ bool TrackWorkflow::checkNextClip( qint64 currentFrame )
else
if
(
next
.
key
()
==
currentFrame
)
{
//It should have been initialized now, however, this ain't very safe :/
//TODO: remove this.
Q_ASSERT
(
next
.
value
()
->
isReady
()
);
// qDebug() << "Switching current clip workflow";
//Using it as the current clip from now on.
...
...
@@ -138,10 +139,7 @@ unsigned char* TrackWorkflow::getOutput( qint64 currentFrame )
else
{
if
(
clipsRemaining
==
false
)
{
// qDebug() << "End of track";
return
NULL
;
}
}
return
ret
;
}
...
...
@@ -153,8 +151,6 @@ void TrackWorkflow::setPosition( float pos )
const
QMap
<
qint64
,
ClipWorkflow
*>::
iterator
end
=
m_clips
.
end
();
QMap
<
qint64
,
ClipWorkflow
*>::
iterator
next
=
end
;
if
(
m_mediaPlayer
->
isPlaying
()
==
false
)
return
;
QWriteLocker
lock
(
m_currentLock
);
if
(
frame
>
m_length
)
{
...
...
@@ -185,13 +181,13 @@ void TrackWorkflow::setPosition( float pos )
next
=
it
;
if
(
next
!=
m_clips
.
begin
()
)
{
qDebug
()
<<
"Next clip isn't the first one"
;
//
qDebug() << "Next clip isn't the first one";
next
=
next
-
1
;
//Since the iterator must point to the previous video
}
else
{
next
=
end
;
qDebug
()
<<
"Next clip is the first of the track"
;
//
qDebug() << "Next clip is the first of the track";
}
// in order to checkNextClip() to work.
it
=
end
;
...
...
src/Workflow/TrackWorkflow.h
View file @
b68959f3
...
...
@@ -83,6 +83,11 @@ class TrackWorkflow : public QObject
QMutex
*
m_condMutex
;
QReadWriteLock
*
m_currentLock
;
QWaitCondition
*
m_waitCondition
;
/**
* This is the MediaPlayer that the clipworkflow
* will be using to process its render.
* It is never used internally.
*/
LibVLCpp
::
MediaPlayer
*
m_mediaPlayer
;
/**
* \brief The track length in frames.
...
...
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