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
c4847c3f
Commit
c4847c3f
authored
Aug 24, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switching back to VLC 1.0.1
parent
53bc37a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
src/GUI/Transcode.cpp
src/GUI/Transcode.cpp
+1
-1
src/LibVLCpp/VLCException.cpp
src/LibVLCpp/VLCException.cpp
+2
-1
src/LibVLCpp/VLCInstance.cpp
src/LibVLCpp/VLCInstance.cpp
+1
-1
src/LibVLCpp/VLCMediaPlayer.cpp
src/LibVLCpp/VLCMediaPlayer.cpp
+4
-4
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+2
-2
No files found.
src/GUI/Transcode.cpp
View file @
c4847c3f
...
@@ -33,7 +33,7 @@ static bool catchVLCException( libvlc_exception_t *ex )
...
@@ -33,7 +33,7 @@ static bool catchVLCException( libvlc_exception_t *ex )
{
{
if
(
libvlc_exception_raised
(
ex
)
)
if
(
libvlc_exception_raised
(
ex
)
)
{
{
qDebug
()
<<
libvlc_e
rrmsg
(
);
qDebug
()
<<
libvlc_e
xception_get_message
(
ex
);
libvlc_exception_clear
(
ex
);
libvlc_exception_clear
(
ex
);
return
(
true
);
return
(
true
);
}
}
...
...
src/LibVLCpp/VLCException.cpp
View file @
c4847c3f
...
@@ -48,7 +48,8 @@ void Exception::setErrorCallback( Exception::errorCallback handler, void*
...
@@ -48,7 +48,8 @@ void Exception::setErrorCallback( Exception::errorCallback handler, void*
const
char
*
Exception
::
getErrorText
()
const
const
char
*
Exception
::
getErrorText
()
const
{
{
return
libvlc_errmsg
();
// return libvlc_errmsg();
return
libvlc_exception_get_message
(
m_internalPtr
);
}
}
void
Exception
::
clear
()
void
Exception
::
clear
()
...
...
src/LibVLCpp/VLCInstance.cpp
View file @
c4847c3f
...
@@ -32,7 +32,7 @@ Instance::Instance()
...
@@ -32,7 +32,7 @@ Instance::Instance()
{
{
char
const
*
argv
[]
=
char
const
*
argv
[]
=
{
{
//
"-vvvvv",
"-vvvvv"
,
"--no-skip-frames"
,
"--no-skip-frames"
,
// "--intf", "dummy",
// "--intf", "dummy",
//"--no-audio",
//"--no-audio",
...
...
src/LibVLCpp/VLCMediaPlayer.cpp
View file @
c4847c3f
...
@@ -43,7 +43,7 @@ MediaPlayer::MediaPlayer()
...
@@ -43,7 +43,7 @@ MediaPlayer::MediaPlayer()
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerStopped
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerStopped
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerEndReached
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerEndReached
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerPositionChanged
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerPositionChanged
,
callbacks
,
this
,
m_ex
);
libvlc_event_attach
(
p_em
,
libvlc_MediaPlayerLengthChanged
,
callbacks
,
this
,
m_ex
);
//
libvlc_event_attach( p_em, libvlc_MediaPlayerLengthChanged, callbacks,this,m_ex );
}
}
MediaPlayer
::
MediaPlayer
(
Media
*
media
)
MediaPlayer
::
MediaPlayer
(
Media
*
media
)
...
@@ -104,9 +104,9 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
...
@@ -104,9 +104,9 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
case
libvlc_MediaPlayerPositionChanged
:
case
libvlc_MediaPlayerPositionChanged
:
self
->
emit
positionChanged
();
self
->
emit
positionChanged
();
break
;
break
;
case
libvlc_MediaPlayerLengthChanged
:
//
case libvlc_MediaPlayerLengthChanged:
self
->
emit
lengthChanged
();
//
self->emit lengthChanged();
break
;
//
break;
case
libvlc_MediaPlayerSnapshotTaken
:
case
libvlc_MediaPlayerSnapshotTaken
:
self
->
emit
snapshotTaken
();
self
->
emit
snapshotTaken
();
break
;
break
;
...
...
src/Metadata/MetaDataWorker.cpp
View file @
c4847c3f
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
MetaDataWorker
::
MetaDataWorker
(
Media
*
media
)
:
MetaDataWorker
::
MetaDataWorker
(
Media
*
media
)
:
m_currentMedia
(
media
),
m_currentMedia
(
media
),
m_mediaIsPlaying
(
false
),
m_mediaIsPlaying
(
false
),
m_lengthHasChanged
(
fals
e
)
m_lengthHasChanged
(
tru
e
)
{
{
m_mediaPlayer
=
new
LibVLCpp
::
MediaPlayer
();
m_mediaPlayer
=
new
LibVLCpp
::
MediaPlayer
();
}
}
...
@@ -74,7 +74,7 @@ void MetaDataWorker::computeImageMetaData()
...
@@ -74,7 +74,7 @@ void MetaDataWorker::computeImageMetaData()
void
MetaDataWorker
::
getMetaData
()
void
MetaDataWorker
::
getMetaData
()
{
{
m_mediaIsPlaying
=
false
;
m_mediaIsPlaying
=
false
;
m_lengthHasChanged
=
fals
e
;
m_lengthHasChanged
=
tru
e
;
//In order to wait for the VOUT to be ready:
//In order to wait for the VOUT to be ready:
while
(
m_mediaPlayer
->
getWidth
()
==
0
)
while
(
m_mediaPlayer
->
getWidth
()
==
0
)
...
...
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