Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (3)
Bump vlcpp submodule version
· f772ac49
Hugo Beauzée-Luyssen
authored
May 31, 2019
f772ac49
npapi: Disable marquee string getter
· ae603761
Hugo Beauzée-Luyssen
authored
May 31, 2019
ae603761
activex: Disable marquee string getter
· cab2b296
Hugo Beauzée-Luyssen
authored
May 31, 2019
cab2b296
Hide whitespace changes
Inline
Side-by-side
activex/vlccontrol2.cpp
View file @
cab2b296
...
...
@@ -888,10 +888,14 @@ STDMETHODIMP VLCMarquee::get_text(BSTR *val)
if
(
NULL
==
val
)
return
E_POINTER
;
#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0)
auto
str
=
_plug
->
get_player
().
get_mp
().
marqueeString
(
libvlc_marquee_Text
);
if
(
!
str
.
empty
()
)
*
val
=
BSTRFromCStr
(
CP_UTF8
,
str
.
c_str
()
);
return
S_OK
;
#else
return
E_INVALIDARG
;
#endif
}
STDMETHODIMP
VLCMarquee
::
put_text
(
BSTR
val
)
...
...
npapi/npruntime/npolibvlc.cpp
View file @
cab2b296
...
...
@@ -1694,9 +1694,11 @@ LibvlcMarqueeNPObject::getProperty(int index, npapi::OutVariant& result)
result
=
position_bynumber
(
mp
.
marqueeInt
(
libvlc_marquee_Position
)
);
return
INVOKERESULT_NO_ERROR
;
#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0)
case
ID_marquee_text
:
result
=
mp
.
marqueeString
(
libvlc_marquee_Text
);
return
INVOKERESULT_NO_ERROR
;
#endif
}
return
INVOKERESULT_GENERIC_ERROR
;
}
...
...
vlcpp
@
4955846d
Compare
5147d358
...
4955846d
Subproject commit
5147d358c5918bdf1ebb96d1292b3b7ac2c800f9
Subproject commit
4955846df7abad685c72b2202e2c445dc42feb11