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
cf962ef1
Commit
cf962ef1
authored
Jan 15, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Next time, i'll save my merge before adding it -_-
parent
0e3f5919
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+3
-10
No files found.
src/Workflow/ClipWorkflow.cpp
View file @
cf962ef1
...
...
@@ -56,21 +56,14 @@ ClipWorkflow::~ClipWorkflow()
void
ClipWorkflow
::
initialize
()
{
<<<<<<<
HEAD
if
(
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Image
)
m_vlcMedia
=
new
LibVLCpp
::
Media
(
"fake:///"
+
m_clip
->
getParent
()
->
getFileInfo
()
->
absoluteFilePath
()
);
else
m_vlcMedia
=
new
LibVLCpp
::
Media
(
"file:///"
+
m_clip
->
getParent
()
->
getFileInfo
()
->
absoluteFilePath
()
);
m_currentPts
=
-
1
;
m_previousPts
=
-
1
;
m_pauseDuration
=
-
1
;
=======
// qDebug() << "Setting state to initializing";
setState
(
ClipWorkflow
::
Initializing
);
// qDebug() << "State is Initializing.";
m_vlcMedia
=
new
LibVLCpp
::
Media
(
m_clip
->
getParent
()
->
getMrl
()
);
>>>>>>>
master
m_currentPts
=
-
1
;
m_previousPts
=
-
1
;
m_pauseDuration
=
-
1
;
initVlcOutput
();
m_mediaPlayer
=
MemoryPool
<
LibVLCpp
::
MediaPlayer
>::
getInstance
()
->
get
();
m_mediaPlayer
->
setMedia
(
m_vlcMedia
);
...
...
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