Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
6bd7c460
Commit
6bd7c460
authored
May 01, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vout: use var_Inherit*() for video-title* variables
parent
f7a9144d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
10 deletions
+5
-10
modules/video_output/msw/common.c
modules/video_output/msw/common.c
+0
-1
modules/video_output/msw/events.c
modules/video_output/msw/events.c
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+3
-3
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+0
-4
src/video_output/vout_wrapper.c
src/video_output/vout_wrapper.c
+1
-1
No files found.
modules/video_output/msw/common.c
View file @
6bd7c460
...
@@ -77,7 +77,6 @@ int CommonInit(vout_display_t *vd)
...
@@ -77,7 +77,6 @@ int CommonInit(vout_display_t *vd)
sys
->
is_first_display
=
true
;
sys
->
is_first_display
=
true
;
sys
->
is_on_top
=
false
;
sys
->
is_on_top
=
false
;
var_Create
(
vd
,
"video-title"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
vd
,
"video-deco"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
var_Create
(
vd
,
"video-deco"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
/* */
/* */
...
...
modules/video_output/msw/events.c
View file @
6bd7c460
...
@@ -957,7 +957,7 @@ void EventThreadMouseHide( event_thread_t *p_event )
...
@@ -957,7 +957,7 @@ void EventThreadMouseHide( event_thread_t *p_event )
void
EventThreadUpdateTitle
(
event_thread_t
*
p_event
,
const
char
*
psz_fallback
)
void
EventThreadUpdateTitle
(
event_thread_t
*
p_event
,
const
char
*
psz_fallback
)
{
{
char
*
psz_title
=
var_
GetNonEmpty
String
(
p_event
->
vd
,
"video-title"
);
char
*
psz_title
=
var_
Inherit
String
(
p_event
->
vd
,
"video-title"
);
if
(
!
psz_title
)
if
(
!
psz_title
)
psz_title
=
strdup
(
psz_fallback
);
psz_title
=
strdup
(
psz_fallback
);
if
(
!
psz_title
)
if
(
!
psz_title
)
...
...
src/video_output/video_output.c
View file @
6bd7c460
...
@@ -149,9 +149,9 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
...
@@ -149,9 +149,9 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
/* Take care of some "interface/control" related initialisations */
/* Take care of some "interface/control" related initialisations */
vout_IntfInit
(
vout
);
vout_IntfInit
(
vout
);
vout
->
p
->
title
.
show
=
var_
Ge
tBool
(
vout
,
"video-title-show"
);
vout
->
p
->
title
.
show
=
var_
Inheri
tBool
(
vout
,
"video-title-show"
);
vout
->
p
->
title
.
timeout
=
var_
Ge
tInteger
(
vout
,
"video-title-timeout"
);
vout
->
p
->
title
.
timeout
=
var_
Inheri
tInteger
(
vout
,
"video-title-timeout"
);
vout
->
p
->
title
.
position
=
var_
Ge
tInteger
(
vout
,
"video-title-position"
);
vout
->
p
->
title
.
position
=
var_
Inheri
tInteger
(
vout
,
"video-title-position"
);
/* Get splitter name if present */
/* Get splitter name if present */
char
*
splitter_name
=
var_InheritString
(
vout
,
"video-splitter"
);
char
*
splitter_name
=
var_InheritString
(
vout
,
"video-splitter"
);
...
...
src/video_output/vout_intf.c
View file @
6bd7c460
...
@@ -162,10 +162,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -162,10 +162,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Create
(
p_vout
,
"mouse-hide-timeout"
,
var_Create
(
p_vout
,
"mouse-hide-timeout"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_vout
,
"video-title-show"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_vout
,
"video-title-timeout"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_vout
,
"video-title-position"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
/* Zoom object var */
/* Zoom object var */
var_Create
(
p_vout
,
"zoom"
,
VLC_VAR_FLOAT
|
VLC_VAR_ISCOMMAND
|
var_Create
(
p_vout
,
"zoom"
,
VLC_VAR_FLOAT
|
VLC_VAR_ISCOMMAND
|
VLC_VAR_HASCHOICE
|
VLC_VAR_DOINHERIT
);
VLC_VAR_HASCHOICE
|
VLC_VAR_DOINHERIT
);
...
...
src/video_output/vout_wrapper.c
View file @
6bd7c460
...
@@ -54,7 +54,7 @@ int vout_OpenWrapper(vout_thread_t *vout,
...
@@ -54,7 +54,7 @@ int vout_OpenWrapper(vout_thread_t *vout,
msg_Dbg
(
vout
,
"Opening vout display wrapper"
);
msg_Dbg
(
vout
,
"Opening vout display wrapper"
);
/* */
/* */
sys
->
display
.
title
=
var_
CreateGetNonEmpty
String
(
vout
,
"video-title"
);
sys
->
display
.
title
=
var_
Inherit
String
(
vout
,
"video-title"
);
/* */
/* */
const
mtime_t
double_click_timeout
=
300000
;
const
mtime_t
double_click_timeout
=
300000
;
...
...
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