Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC Browser Plugins
Manage
Activity
Members
Labels
Plan
Issues
26
Issue boards
Milestones
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC Browser Plugins
Compare revisions
228dacb8332e1243a7bc255b3afca234348c4985 to 1df320cc1f12740ba87463231643448d359ce03a
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
videolan/npapi-vlc
Select target project
No results found
1df320cc1f12740ba87463231643448d359ce03a
Select Git revision
Swap
Target
videolan/npapi-vlc
Select target project
videolan/npapi-vlc
mstorsjo/npapi-vlc
happychen/npapi-vlc
robUx4/npapi-vlc
chouquette/npapi-vlc
CymGen30/npapi-vlc
Ggjgg/npapi-vlc
dknyazev.bia/npapi-vlc
jfkruuse/npapi-vlc
jeffrey140180/npapi-vlc
megan30/npapi-vlc
gtskhadadze83/npapi-vlc
Mathias_Couder/npapi-vlc
troygallant541/npapi-vlc
bowtojoker02/npapi-vlc
tnhx/npapi-vlc
mfkl/npapi-vlc
mkutazi76/npapi-vlc
khoakun67/npapi-vlc
blackpjotr/npapi-vlc
tguillem/npapi-vlc
q.alnajem/npapi-vlc
alexandra.pomerleau90/npapi-vlc
ruanbester07/npapi-vlc
thembankambul977/npapi-vlc
lukmanaja2406/npapi-vlc
Ninaquinin/npapi-vlc
litteh82/npapi-vlc
ba6986che/npapi-vlc
mr.abakumoff2/npapi-vlc
30 results
228dacb8332e1243a7bc255b3afca234348c4985
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Use new media api
· 82ae7804
Thomas Guillem
authored
2 years ago
82ae7804
Bump CI images
· 1df320cc
Thomas Guillem
authored
2 years ago
1df320cc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
activex/vlccontrol2.cpp
+10
-10
10 additions, 10 deletions
activex/vlccontrol2.cpp
common/vlc_player.cpp
+3
-3
3 additions, 3 deletions
common/vlc_player.cpp
vlcpp
+1
-1
1 addition, 1 deletion
vlcpp
with
16 additions
and
16 deletions
.gitlab-ci.yml
View file @
1df320cc
variables
:
GIT_SUBMODULE_STRATEGY
:
normal
WIN32_IMAGE
:
registry.videolan.org/medialibrary-win32:20220
620092626
WIN64_IMAGE
:
registry.videolan.org/medialibrary-win64:20220
620085314
WIN32_IMAGE
:
registry.videolan.org/medialibrary-win32:20220
728090852
WIN64_IMAGE
:
registry.videolan.org/medialibrary-win64:20220
728080707
PKG_CONFIG_LIBDIR
:
/prefix/lib/pkgconfig
.common_build
:
...
...
This diff is collapsed.
Click to expand it.
activex/vlccontrol2.cpp
View file @
1df320cc
...
...
@@ -454,7 +454,7 @@ STDMETHODIMP VLCAudio::get_track(long* track)
STDMETHODIMP
VLCAudio
::
put_track
(
long
track
)
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
,
false
);
if
(
track
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
_plug
->
get_player
().
get_mp
().
selectTrack
(
tracks
[
track
]
);
...
...
@@ -473,7 +473,7 @@ STDMETHODIMP VLCAudio::get_count(long* trackNumber)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
*
trackNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
).
size
();
*
trackNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
,
false
).
size
();
break
;
}
default
:
...
...
@@ -506,7 +506,7 @@ STDMETHODIMP VLCAudio::description(long trackId, BSTR* name)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
,
false
);
if
(
trackId
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
*
name
=
BSTRFromCStr
(
CP_UTF8
,
tracks
[
trackId
].
name
().
c_str
()
);
...
...
@@ -1146,7 +1146,7 @@ STDMETHODIMP VLCSubtitle::get_track(long* spu)
//FIXME: this should be unsigned
STDMETHODIMP
VLCSubtitle
::
put_track
(
long
spu
)
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
,
false
);
if
(
spu
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
_plug
->
get_player
().
get_mp
().
selectTrack
(
tracks
[
spu
]
);
...
...
@@ -1165,7 +1165,7 @@ STDMETHODIMP VLCSubtitle::get_count(long* spuNumber)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
*
spuNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
).
size
();
*
spuNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
,
false
).
size
();
break
;
}
default
:
...
...
@@ -1199,7 +1199,7 @@ STDMETHODIMP VLCSubtitle::description(long nameID, BSTR* name)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
,
false
);
if
(
nameID
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
*
name
=
BSTRFromCStr
(
CP_UTF8
,
tracks
[
nameID
].
name
().
c_str
()
);
...
...
@@ -1362,7 +1362,7 @@ STDMETHODIMP VLCVideo::get_subtitle(long* spu)
STDMETHODIMP
VLCVideo
::
put_subtitle
(
long
spu
)
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
,
false
);
if
(
spu
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
_plug
->
get_player
().
get_mp
().
selectTrack
(
tracks
[
spu
]
);
...
...
@@ -1520,7 +1520,7 @@ STDMETHODIMP VLCVideo::get_track(long* track)
STDMETHODIMP
VLCVideo
::
put_track
(
long
track
)
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
,
false
);
if
(
track
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
_plug
->
get_player
().
get_mp
().
selectTrack
(
tracks
[
track
]
);
...
...
@@ -1539,7 +1539,7 @@ STDMETHODIMP VLCVideo::get_count(long* trackNumber)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
*
trackNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
).
size
();
*
trackNumber
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
,
false
).
size
();
break
;
}
default
:
...
...
@@ -1574,7 +1574,7 @@ STDMETHODIMP VLCVideo::description(long trackId, BSTR* name)
case
libvlc_Playing
:
case
libvlc_Paused
:
{
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
);
auto
tracks
=
_plug
->
get_player
().
get_mp
().
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
,
false
);
if
(
trackId
>=
tracks
.
size
()
)
return
E_INVALIDARG
;
*
name
=
BSTRFromCStr
(
CP_UTF8
,
tracks
[
trackId
].
name
().
c_str
()
);
...
...
This diff is collapsed.
Click to expand it.
common/vlc_player.cpp
View file @
1df320cc
...
...
@@ -173,19 +173,19 @@ void vlc_player::play()
int
vlc_player
::
currentAudioTrack
()
{
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
);
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Audio
,
true
);
return
getCurrentTrack
(
tracks
);
}
int
vlc_player
::
currentSubtitleTrack
()
{
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
);
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Subtitle
,
true
);
return
getCurrentTrack
(
tracks
);
}
int
vlc_player
::
currentVideoTrack
()
{
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
);
auto
tracks
=
_mp
.
tracks
(
VLC
::
MediaTrack
::
Type
::
Video
,
true
);
return
getCurrentTrack
(
tracks
);
}
...
...
This diff is collapsed.
Click to expand it.
vlcpp
@
d077d7e9
Compare
0c7d3968
...
d077d7e9
Subproject commit
0c7d3968010f1b27b36e78c11e07e4d7f6fe756b
Subproject commit
d077d7e9ac3810b4adda123e1d8156bbcd3793b5
This diff is collapsed.
Click to expand it.