Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
1d1267be
Commit
1d1267be
authored
Sep 04, 2009
by
Hugo Beauzee-Luyssen
Browse files
Removed debug
parent
3b27d9d3
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/LibVLCpp/VLCMediaPlayer.cpp
View file @
1d1267be
...
@@ -93,6 +93,7 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
...
@@ -93,6 +93,7 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
self
->
emit
paused
();
self
->
emit
paused
();
break
;
break
;
case
libvlc_MediaPlayerStopped
:
case
libvlc_MediaPlayerStopped
:
// qDebug() << "Media player stopped";
self
->
emit
stopped
();
self
->
emit
stopped
();
break
;
break
;
case
libvlc_MediaPlayerEndReached
:
case
libvlc_MediaPlayerEndReached
:
...
...
src/Workflow/ClipWorkflow.cpp
View file @
1d1267be
...
@@ -73,6 +73,7 @@ void ClipWorkflow::checkStateChange()
...
@@ -73,6 +73,7 @@ void ClipWorkflow::checkStateChange()
if
(
m_requiredState
!=
ClipWorkflow
::
None
)
if
(
m_requiredState
!=
ClipWorkflow
::
None
)
{
{
m_state
=
m_requiredState
;
m_state
=
m_requiredState
;
// qDebug() << "Applying required state change:" << m_state;
m_requiredState
=
ClipWorkflow
::
None
;
m_requiredState
=
ClipWorkflow
::
None
;
checkSynchronisation
(
m_state
);
checkSynchronisation
(
m_state
);
}
}
...
@@ -99,9 +100,9 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
...
@@ -99,9 +100,9 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
cw
->
m_renderWaitCond
->
wake
();
cw
->
m_renderWaitCond
->
wake
();
cw
->
emit
renderComplete
(
cw
);
cw
->
emit
renderComplete
(
cw
);
qDebug
()
<<
"Entering cond wait"
;
//
qDebug() << "Entering cond wait";
cw
->
m_waitCond
->
wait
(
cw
->
m_condMutex
);
cw
->
m_waitCond
->
wait
(
cw
->
m_condMutex
);
qDebug
()
<<
"Leaving condwait"
;
//
qDebug() << "Leaving condwait";
cw
->
m_stateLock
->
lockForWrite
();
cw
->
m_stateLock
->
lockForWrite
();
if
(
cw
->
m_state
==
Sleeping
)
if
(
cw
->
m_state
==
Sleeping
)
cw
->
m_state
=
Rendering
;
cw
->
m_state
=
Rendering
;
...
@@ -235,7 +236,6 @@ void ClipWorkflow::stop()
...
@@ -235,7 +236,6 @@ void ClipWorkflow::stop()
delete
m_vlcMedia
;
delete
m_vlcMedia
;
m_initFlag
=
false
;
m_initFlag
=
false
;
m_rendering
=
false
;
m_rendering
=
false
;
qDebug
()
<<
"Clip workflow stopped"
;
}
}
else
else
qDebug
()
<<
"ClipWorkflow has already been stopped"
;
qDebug
()
<<
"ClipWorkflow has already been stopped"
;
...
@@ -274,6 +274,7 @@ void ClipWorkflow::setState( State state )
...
@@ -274,6 +274,7 @@ void ClipWorkflow::setState( State state )
{
{
{
{
QWriteLocker
lock
(
m_stateLock
);
QWriteLocker
lock
(
m_stateLock
);
// qDebug() << "Setting state to" << state;
m_state
=
state
;
m_state
=
state
;
}
}
checkSynchronisation
(
state
);
checkSynchronisation
(
state
);
...
...
src/Workflow/TrackWorkflow.cpp
View file @
1d1267be
...
@@ -216,7 +216,6 @@ void TrackWorkflow::stopClipWorkflow( ClipWorkflow* cw )
...
@@ -216,7 +216,6 @@ void TrackWorkflow::stopClipWorkflow( ClipWorkflow* cw )
cw
->
getStateLock
()
->
unlock
();
cw
->
getStateLock
()
->
unlock
();
return
;
return
;
}
}
qDebug
()
<<
"Stopping clip. state:"
<<
cw
->
getState
();
if
(
cw
->
getState
()
==
ClipWorkflow
::
Sleeping
||
if
(
cw
->
getState
()
==
ClipWorkflow
::
Sleeping
||
cw
->
getState
()
==
ClipWorkflow
::
Ready
||
cw
->
getState
()
==
ClipWorkflow
::
Ready
||
cw
->
getState
()
==
ClipWorkflow
::
EndReached
)
cw
->
getState
()
==
ClipWorkflow
::
EndReached
)
...
...
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