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
c67b5ea6
Commit
c67b5ea6
authored
Mar 29, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zvbi: convert dangerous OSDMessage() to safer msg_Info()
Ideally, I guess a text SPU should be emitted instead.
parent
a95553a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
modules/codec/zvbi.c
modules/codec/zvbi.c
+4
-11
No files found.
modules/codec/zvbi.c
View file @
c67b5ea6
...
...
@@ -47,7 +47,6 @@
#include <libzvbi.h>
#include <vlc_codec.h>
#include <vlc_vout_osd.h>
/*****************************************************************************
* Module descriptor.
...
...
@@ -661,14 +660,6 @@ static int Position( vlc_object_t *p_this, char const *psz_cmd,
return
VLC_SUCCESS
;
}
#include <vlc_vout.h>
#define OSDMessage(dec, fmt, ...) do { \
vout_thread_t *p_vout = vlc_object_find( dec, VLC_OBJECT_VOUT, FIND_ANYWHERE ); \
if( p_vout ) { \
vout_OSDMessage( p_vout, fmt, __VA_ARGS__ ); \
vlc_object_release( p_vout ); \
} } while(0)
static
int
EventKey
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
...
...
@@ -691,7 +682,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
if
(
!
vbi_bcd_digits_greater
(
p_sys
->
i_wanted_subpage
,
0x00
)
||
vbi_bcd_digits_greater
(
p_sys
->
i_wanted_subpage
,
0x99
)
)
p_sys
->
i_wanted_subpage
=
VBI_ANY_SUBNO
;
else
OSDMessage
(
p_this
,
SPU_DEFAULT_CHANNEL
,
"%s: %d"
,
_
(
"Subpage"
),
vbi_bcd2dec
(
p_sys
->
i_wanted_subpage
)
);
msg_Info
(
p_dec
,
"subpage: %d"
,
vbi_bcd2dec
(
p_sys
->
i_wanted_subpage
)
);
p_sys
->
b_update
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
...
...
@@ -705,7 +697,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
p_sys
->
i_key
[
0
]
=
p_sys
->
i_key
[
1
];
p_sys
->
i_key
[
1
]
=
p_sys
->
i_key
[
2
];
p_sys
->
i_key
[
2
]
=
(
int
)(
newval
.
i_int
-
'0'
);
OSDMessage
(
p_this
,
SPU_DEFAULT_CHANNEL
,
"%s: %c%c%c"
,
_
(
"Page"
),
(
char
)(
p_sys
->
i_key
[
0
]
+
'0'
),
(
char
)(
p_sys
->
i_key
[
1
]
+
'0'
),
(
char
)(
p_sys
->
i_key
[
2
]
+
'0'
)
);
msg_Info
(
p_dec
,
"page: %c%c%c"
,
(
char
)(
p_sys
->
i_key
[
0
]
+
'0'
),
(
char
)(
p_sys
->
i_key
[
1
]
+
'0'
),
(
char
)(
p_sys
->
i_key
[
2
]
+
'0'
)
);
int
i_new_page
=
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