Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1e98eefb
Commit
1e98eefb
authored
May 13, 2005
by
Steve Lhomme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv.cpp: don't use a button if it doesn't exist
parent
05e3f2f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+12
-1
No files found.
modules/demux/mkv.cpp
View file @
1e98eefb
...
...
@@ -1231,6 +1231,7 @@ public:
,
f_duration
(
-
1.0
)
,
b_ui_hooked
(
false
)
,
p_input
(
NULL
)
,
b_pci_packet_set
(
false
)
,
i_curr_button
(
0
)
,
p_ev
(
NULL
)
{
...
...
@@ -1294,6 +1295,7 @@ public:
/* for spu variables */
input_thread_t
*
p_input
;
pci_t
pci_packet
;
bool
b_pci_packet_set
;
int16
i_curr_button
;
uint8_t
alpha
[
4
];
vlc_mutex_t
lock_demuxer
;
...
...
@@ -1817,6 +1819,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts,
vlc_mutex_lock
(
&
p_sys
->
p_ev
->
lock
);
memcpy
(
&
p_sys
->
pci_packet
,
&
p_block
->
p_buffer
[
1
],
sizeof
(
pci_t
)
);
p_sys
->
SwapButtons
();
p_sys
->
b_pci_packet_set
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
p_ev
->
lock
);
block_Release
(
p_block
);
}
...
...
@@ -1941,7 +1944,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
/* add all es */
msg_Dbg
(
&
sys
.
demuxer
,
"found %d es"
,
tracks
.
size
()
);
sys
.
b_pci_packet_set
=
false
;
for
(
i_track
=
0
;
i_track
<
tracks
.
size
();
i_track
++
)
{
if
(
tracks
[
i_track
]
->
fmt
.
i_cat
==
UNKNOWN_ES
)
...
...
@@ -2352,6 +2355,14 @@ int demux_sys_t::EventThread( vlc_object_t *p_this )
vlc_mutex_lock
(
&
p_ev
->
lock
);
if
(
!
p_sys
->
b_pci_packet_set
)
{
vlc_mutex_unlock
(
&
p_ev
->
lock
);
/* Wait 100ms */
msleep
(
100000
);
continue
;
}
pci_t
*
pci
=
(
pci_t
*
)
&
p_sys
->
pci_packet
;
var_Get
(
p_ev
->
p_vlc
,
"key-pressed"
,
&
valk
);
...
...
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