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
7d775ce0
Commit
7d775ce0
authored
Jan 15, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug with mrl percent encoding.
We now use getMrl in ClipWorkflow
parent
86f25af3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
src/Media/Media.cpp
src/Media/Media.cpp
+4
-2
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+1
-1
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+1
-4
No files found.
src/Media/Media.cpp
View file @
7d775ce0
...
...
@@ -59,9 +59,11 @@ Media::Media( const QString& filePath, const QString& uuid /*= QString()*/ )
m_fileName
=
m_fileInfo
->
fileName
();
setFileType
();
if
(
m_fileType
==
Media
::
Video
||
m_fileType
==
Media
::
Audio
)
m_mrl
=
"file:///"
+
QUrl
::
toPercentEncoding
(
m_fileInfo
->
absoluteFilePath
()
);
m_mrl
=
"file:///"
+
QUrl
::
toPercentEncoding
(
m_fileInfo
->
absoluteFilePath
(),
"/"
);
else
m_mrl
=
"fake:///"
+
QUrl
::
toPercentEncoding
(
m_fileInfo
->
absoluteFilePath
()
);
m_mrl
=
"fake:///"
+
QUrl
::
toPercentEncoding
(
m_fileInfo
->
absoluteFilePath
(),
"/"
);
}
else
{
...
...
src/Metadata/MetaDataWorker.cpp
View file @
7d775ce0
...
...
@@ -120,7 +120,6 @@ void MetaDataWorker::metaDataAvailable()
m_media
->
setFps
(
Clip
::
DefaultFPS
);
}
m_media
->
setNbFrames
(
(
m_media
->
getLengthMS
()
/
1000
)
*
m_media
->
getFps
()
);
m_media
->
emitMetaDataComputed
();
//Setting time for snapshot :
if
(
m_media
->
getFileType
()
==
Media
::
Video
||
m_media
->
getFileType
()
==
Media
::
Image
)
...
...
@@ -172,6 +171,7 @@ void MetaDataWorker::setSnapshot()
void
MetaDataWorker
::
finalize
()
{
m_media
->
emitMetaDataComputed
();
m_media
->
disconnect
(
this
);
emit
computed
();
delete
this
;
...
...
src/Workflow/ClipWorkflow.cpp
View file @
7d775ce0
...
...
@@ -77,10 +77,7 @@ void ClipWorkflow::initialize( bool preloading /*= false*/ )
// qDebug() << "Setting state to initializing";
setState
(
Initializing
);
// qDebug() << "State is Initializing.";
if
(
m_clip
->
getParent
()
->
getFileType
()
==
Media
::
Image
)
m_vlcMedia
=
new
LibVLCpp
::
Media
(
"fake:///"
+
QUrl
::
toPercentEncoding
(
m_clip
->
getParent
()
->
getFileInfo
()
->
absoluteFilePath
()
)
);
else
m_vlcMedia
=
new
LibVLCpp
::
Media
(
"file:///"
+
QUrl
::
toPercentEncoding
(
m_clip
->
getParent
()
->
getFileInfo
()
->
absoluteFilePath
()
)
);
m_vlcMedia
=
new
LibVLCpp
::
Media
(
m_clip
->
getParent
()
->
getMrl
()
);
initVlcOutput
();
m_mediaPlayer
=
Pool
<
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