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
luyikei
VLMC
Commits
f12252db
Commit
f12252db
authored
Jun 17, 2009
by
Hugo Beauzee-Luyssen
Committed by
Ludovic Fauvet
Jun 20, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The timeline tracker doesn't move anymore when rendering to a file.
parent
0c4e6f84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
src/gui/RenderPreviewWidget.cpp
src/gui/RenderPreviewWidget.cpp
+6
-0
src/gui/Timeline.cpp
src/gui/Timeline.cpp
+4
-1
src/gui/Timeline.h
src/gui/Timeline.h
+2
-0
No files found.
src/gui/RenderPreviewWidget.cpp
View file @
f12252db
...
...
@@ -24,6 +24,7 @@
#include <QThread>
#include "RenderPreviewWidget.h"
#include "Timeline.h"
RenderPreviewWidget
::
RenderPreviewWidget
(
MainWorkflow
*
mainWorkflow
,
QWidget
*
renderWidget
)
:
GenericPreviewWidget
(
renderWidget
),
...
...
@@ -91,6 +92,9 @@ void RenderPreviewWidget::unlock( void* datas )
void
RenderPreviewWidget
::
stopPreview
()
{
disconnect
(
m_mainWorkflow
,
SIGNAL
(
frameChanged
(
qint64
)
),
Timeline
::
getInstance
()
->
tracksView
()
->
tracksCursor
(),
SLOT
(
updateCursorPos
(
qint64
)
)
);
//FIXME: shouldn't this call MainWorkflow::stop() ??!!
m_mediaPlayer
->
stop
();
m_isRendering
=
false
;
...
...
@@ -99,6 +103,8 @@ void RenderPreviewWidget::stopPreview()
void
RenderPreviewWidget
::
startPreview
(
Media
*
)
{
connect
(
m_mainWorkflow
,
SIGNAL
(
frameChanged
(
qint64
)
),
Timeline
::
getInstance
()
->
tracksView
()
->
tracksCursor
(),
SLOT
(
updateCursorPos
(
qint64
)
)
);
m_mainWorkflow
->
startRender
();
m_mediaPlayer
->
play
();
m_isRendering
=
true
;
...
...
src/gui/Timeline.cpp
View file @
f12252db
...
...
@@ -27,9 +27,13 @@
#include "TracksView.h"
#include "TracksScene.h"
Timeline
*
Timeline
::
m_instance
=
NULL
;
Timeline
::
Timeline
(
QWidget
*
parent
)
:
QWidget
(
parent
),
m_scale
(
1.0
)
{
Q_ASSERT
(
m_instance
==
NULL
);
m_instance
=
this
;
m_ui
.
setupUi
(
this
);
m_mainWorkflow
=
new
MainWorkflow
(
this
,
5
);
...
...
@@ -55,7 +59,6 @@ Timeline::Timeline( QWidget *parent ) :
setDuration
(
0
);
connect
(
m_tracksView
->
horizontalScrollBar
(),
SIGNAL
(
valueChanged
(
int
)
),
m_tracksRuler
,
SLOT
(
moveRuler
(
int
)
)
);
connect
(
m_tracksView
,
SIGNAL
(
durationChanged
(
int
)
),
this
,
SLOT
(
setDuration
(
int
)
)
);
connect
(
m_mainWorkflow
,
SIGNAL
(
frameChanged
(
qint64
)
),
m_tracksView
->
tracksCursor
(),
SLOT
(
updateCursorPos
(
qint64
)
)
);
}
void
Timeline
::
changeEvent
(
QEvent
*
e
)
...
...
src/gui/Timeline.h
View file @
f12252db
...
...
@@ -38,6 +38,7 @@ public:
TracksView
*
tracksView
()
{
return
m_tracksView
;
}
TracksScene
*
tracksScene
()
{
return
m_tracksScene
;
}
MainWorkflow
*
getMainWorkflow
()
{
return
m_mainWorkflow
;
}
static
Timeline
*
getInstance
()
{
return
m_instance
;
}
public
slots
:
void
changeZoom
(
int
factor
);
...
...
@@ -53,6 +54,7 @@ private:
TracksRuler
*
m_tracksRuler
;
double
m_scale
;
MainWorkflow
*
m_mainWorkflow
;
static
Timeline
*
m_instance
;
};
#endif // TIMELINE_H
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