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
ecd768a3
Commit
ecd768a3
authored
Jun 11, 2009
by
Hugo Beauzee-Luyssen
Committed by
Ludovic Fauvet
Jun 20, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored code for "stopped preview" status.
parent
82c9865f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
14 deletions
+23
-14
src/gui/ClipPreviewWidget.cpp
src/gui/ClipPreviewWidget.cpp
+10
-10
src/gui/ClipPreviewWidget.h
src/gui/ClipPreviewWidget.h
+0
-1
src/gui/GenericPreviewWidget.h
src/gui/GenericPreviewWidget.h
+13
-1
src/gui/RenderPreviewWidget.cpp
src/gui/RenderPreviewWidget.cpp
+0
-1
src/gui/RenderPreviewWidget.h
src/gui/RenderPreviewWidget.h
+0
-1
No files found.
src/gui/ClipPreviewWidget.cpp
View file @
ecd768a3
...
...
@@ -26,7 +26,7 @@
ClipPreviewWidget
::
ClipPreviewWidget
(
QWidget
*
renderWidget
)
:
GenericPreviewWidget
(
renderWidget
),
m_clipLoaded
(
false
),
m_videoStopped
(
true
),
m_vlcMedia
(
NULL
)
m_clipLoaded
(
false
),
m_vlcMedia
(
NULL
)
{
}
...
...
@@ -50,22 +50,22 @@ void ClipPreviewWidget::startPreview( Media* media )
m_mediaPlayer
->
play
();
m_clipLoaded
=
true
;
m_
videoStopped
=
fals
e
;
m_
isRendering
=
tru
e
;
m_paused
=
false
;
}
void
ClipPreviewWidget
::
setPosition
(
float
newPos
)
{
if
(
m_clipLoaded
==
false
||
m_
videoStopped
==
tru
e
)
if
(
m_clipLoaded
==
false
||
m_
isRendering
==
fals
e
)
return
;
m_mediaPlayer
->
setPosition
(
newPos
);
}
void
ClipPreviewWidget
::
stop
()
{
if
(
m_clipLoaded
==
true
&&
m_
videoStopped
==
fals
e
)
if
(
m_clipLoaded
==
true
&&
m_
isRendering
==
tru
e
)
{
m_
videoStopped
=
tru
e
;
m_
isRendering
=
fals
e
;
m_mediaPlayer
->
stop
();
m_paused
=
false
;
}
...
...
@@ -75,8 +75,8 @@ void ClipPreviewWidget::togglePlayPause( bool forcePause )
{
if
(
m_clipLoaded
==
false
)
return
;
if
(
m_
videoStopped
==
tru
e
)
m_
videoStopped
=
fals
e
;
if
(
m_
isRendering
==
fals
e
)
m_
isRendering
=
tru
e
;
if
(
m_paused
==
false
)
{
...
...
@@ -92,7 +92,7 @@ void ClipPreviewWidget::togglePlayPause( bool forcePause )
void
ClipPreviewWidget
::
nextFrame
()
{
if
(
m_
videoStopped
==
fals
e
&&
m_paused
==
true
)
if
(
m_
isRendering
==
tru
e
&&
m_paused
==
true
)
{
qint64
interval
=
static_cast
<
qint64
>
(
(
1.0
f
/
m_mediaPlayer
->
getFps
())
*
1000.0
f
);
m_mediaPlayer
->
setTime
(
m_mediaPlayer
->
getTime
()
+
interval
);
...
...
@@ -101,7 +101,7 @@ void ClipPreviewWidget::nextFrame()
void
ClipPreviewWidget
::
previousFrame
()
{
if
(
m_
videoStopped
==
false
&&
m_paused
==
true
)
if
(
m_
isRendering
==
false
&&
m_paused
==
true
)
{
qint64
interval
=
static_cast
<
qint64
>
(
(
1.0
f
/
m_mediaPlayer
->
getFps
())
*
1000.0
f
);
m_mediaPlayer
->
setTime
(
m_mediaPlayer
->
getTime
()
-
interval
);
...
...
@@ -131,6 +131,6 @@ void ClipPreviewWidget::__positionChanged()
void
ClipPreviewWidget
::
__endReached
()
{
m_mediaPlayer
->
stop
();
m_
videoStopped
=
tru
e
;
m_
isRendering
=
fals
e
;
emit
endReached
();
}
src/gui/ClipPreviewWidget.h
View file @
ecd768a3
...
...
@@ -49,7 +49,6 @@ public:
private:
bool
m_clipLoaded
;
bool
m_videoStopped
;
LibVLCpp
::
Media
*
m_vlcMedia
;
public
slots
:
...
...
src/gui/GenericPreviewWidget.h
View file @
ecd768a3
...
...
@@ -35,7 +35,9 @@ class GenericPreviewWidget : public QObject
Q_DISABLE_COPY
(
GenericPreviewWidget
);
public:
explicit
GenericPreviewWidget
(
QWidget
*
renderWidget
)
:
m_paused
(
false
)
explicit
GenericPreviewWidget
(
QWidget
*
renderWidget
)
:
m_paused
(
false
),
m_isRendering
(
false
)
{
m_mediaPlayer
=
new
LibVLCpp
::
MediaPlayer
();
m_mediaPlayer
->
setDrawable
(
renderWidget
->
winId
()
);
...
...
@@ -55,6 +57,10 @@ public:
{
return
m_paused
;
}
bool
isRendering
()
const
{
return
m_isRendering
;
}
protected:
LibVLCpp
::
MediaPlayer
*
m_mediaPlayer
;
...
...
@@ -65,6 +71,12 @@ protected:
*/
bool
m_paused
;
/**
* \brief Will be equal to true if a render has been started, even if it paused.
*/
bool
m_isRendering
;
public
slots
:
virtual
void
__positionChanged
()
=
0
;
virtual
void
__videoPaused
()
=
0
;
...
...
src/gui/RenderPreviewWidget.cpp
View file @
ecd768a3
...
...
@@ -28,7 +28,6 @@
RenderPreviewWidget
::
RenderPreviewWidget
(
MainWorkflow
*
mainWorkflow
,
QWidget
*
renderWidget
)
:
GenericPreviewWidget
(
renderWidget
),
m_mainWorkflow
(
mainWorkflow
),
m_isRendering
(
false
),
m_framePlayed
(
false
)
{
m_framePlayedLock
=
new
QReadWriteLock
;
...
...
src/gui/RenderPreviewWidget.h
View file @
ecd768a3
...
...
@@ -60,7 +60,6 @@ class RenderPreviewWidget : public GenericPreviewWidget
private:
MainWorkflow
*
m_mainWorkflow
;
LibVLCpp
::
Media
*
m_media
;
bool
m_isRendering
;
QReadWriteLock
*
m_framePlayedLock
;
bool
m_framePlayed
;
...
...
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