Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLMC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLMC
Commits
d8957fad
Commit
d8957fad
authored
Jan 24, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solving problems when launching a render after previewing the project
parent
c9916340
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
16 deletions
+13
-16
src/Gui/MainWindow.cpp
src/Gui/MainWindow.cpp
+1
-1
src/Project/ProjectManager.cpp
src/Project/ProjectManager.cpp
+0
-4
src/Renderer/WorkflowFileRenderer.cpp
src/Renderer/WorkflowFileRenderer.cpp
+1
-1
src/Renderer/WorkflowRenderer.h
src/Renderer/WorkflowRenderer.h
+8
-8
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+1
-0
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+2
-2
No files found.
src/Gui/MainWindow.cpp
View file @
d8957fad
...
...
@@ -378,7 +378,7 @@ void MainWindow::on_actionRender_triggered()
return
;
else
{
m_renderer
->
stop
();
m_renderer
->
killRenderer
();
if
(
m_fileRenderer
)
delete
m_fileRenderer
;
m_fileRenderer
=
new
WorkflowFileRenderer
(
outputFileName
);
...
...
src/Project/ProjectManager.cpp
View file @
d8957fad
...
...
@@ -29,10 +29,6 @@
#include <errno.h>
#include <signal.h>
//#ifndef Q_WS_WIN
// #include <wait.h>
//#endif
#include "ProjectManager.h"
#include "Library.h"
#include "MainWorkflow.h"
...
...
src/Renderer/WorkflowFileRenderer.cpp
View file @
d8957fad
...
...
@@ -80,7 +80,7 @@ void WorkflowFileRenderer::run()
void
WorkflowFileRenderer
::
stop
()
{
WorkflowRenderer
::
stop
();
WorkflowRenderer
::
killRenderer
();
}
void
WorkflowFileRenderer
::
cancelButtonClicked
()
...
...
src/Renderer/WorkflowRenderer.h
View file @
d8957fad
...
...
@@ -227,6 +227,14 @@ class WorkflowRenderer : public GenericRenderer
qint64
newPos
,
quint32
trackId
,
MainWorkflow
::
TrackType
trackType
,
bool
undoRedoAction
=
false
);
/**
* \brief Completely kill the renderer.
*
* This will stop both mainworkflow and renderer thread.
* This should only be used when destroying the renderer.
* \sa stop();
*/
void
killRenderer
();
private:
/**
...
...
@@ -247,14 +255,6 @@ class WorkflowRenderer : public GenericRenderer
* \brief check for workflow related actions that has been stacked.
*/
void
checkActions
();
/**
* \brief Completely kill the renderer.
*
* This will stop both mainworkflow and renderer thread.
* This should only be used when destroying the renderer.
* \sa stop();
*/
void
killRenderer
();
protected:
/**
...
...
src/Workflow/MainWorkflow.cpp
View file @
d8957fad
...
...
@@ -220,6 +220,7 @@ MainWorkflow::stop()
m_tracks
[
i
]
->
stop
();
m_currentFrame
[
i
]
=
0
;
}
unpause
();
emit
frameChanged
(
0
,
Renderer
);
}
...
...
src/Workflow/TrackWorkflow.cpp
View file @
d8957fad
...
...
@@ -243,7 +243,8 @@ void TrackWorkflow::releasePreviousRender()
}
}
void
*
TrackWorkflow
::
getOutput
(
qint64
currentFrame
,
qint64
subFrame
)
void
*
TrackWorkflow
::
getOutput
(
qint64
currentFrame
,
qint64
subFrame
)
{
releasePreviousRender
();
QReadLocker
lock
(
m_clipsLock
);
...
...
@@ -256,7 +257,6 @@ void* TrackWorkflow::getOutput( qint64 currentFrame, qint64 subFra
if
(
m_lastFrame
==
-
1
)
m_lastFrame
=
currentFrame
;
if
(
checkEnd
(
currentFrame
)
==
true
)
{
emit
trackEndReached
(
m_trackId
);
...
...
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