Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
0d0f59ac
Commit
0d0f59ac
authored
Feb 25, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove argv/argc from libvlc_t (not really needed here)
parent
3f48284e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
14 deletions
+9
-14
include/main.h
include/main.h
+0
-3
modules/video_output/x11/xcommon.c
modules/video_output/x11/xcommon.c
+3
-2
src/config/cmdline.c
src/config/cmdline.c
+6
-9
No files found.
include/main.h
View file @
0d0f59ac
...
@@ -36,9 +36,6 @@ struct libvlc_int_t
...
@@ -36,9 +36,6 @@ struct libvlc_int_t
VLC_COMMON_MEMBERS
VLC_COMMON_MEMBERS
/* Global properties */
/* Global properties */
int
i_argc
;
///< command line arguments count
const
char
**
ppsz_argv
;
///< command line arguments
char
*
psz_homedir
;
///< user's home directory
char
*
psz_homedir
;
///< user's home directory
char
*
psz_configdir
;
///< user's configuration directory
char
*
psz_configdir
;
///< user's configuration directory
char
*
psz_datadir
;
///< user's data directory
char
*
psz_datadir
;
///< user's data directory
...
...
modules/video_output/x11/xcommon.c
View file @
0d0f59ac
...
@@ -1681,13 +1681,14 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -1681,13 +1681,14 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
if
(
!
p_vout
->
b_fullscreen
)
if
(
!
p_vout
->
b_fullscreen
)
{
{
const
char
*
argv
[]
=
{
"vlc"
,
NULL
};
/* Set window manager hints and properties: size hints, command,
/* Set window manager hints and properties: size hints, command,
* window's name, and accepted protocols */
* window's name, and accepted protocols */
XSetWMNormalHints
(
p_vout
->
p_sys
->
p_display
,
XSetWMNormalHints
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
&
xsize_hints
);
p_win
->
base_window
,
&
xsize_hints
);
XSetCommand
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
XSetCommand
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
(
char
**
)
p_vout
->
p_libvlc
->
ppsz_argv
,
(
char
**
)
argv
,
1
);
p_vout
->
p_libvlc
->
i_argc
);
if
(
!
var_GetBool
(
p_vout
,
"video-deco"
)
)
if
(
!
var_GetBool
(
p_vout
,
"video-deco"
)
)
{
{
...
...
src/config/cmdline.c
View file @
0d0f59ac
...
@@ -83,15 +83,12 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
...
@@ -83,15 +83,12 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
vlc_list_t
*
p_list
;
vlc_list_t
*
p_list
;
struct
option
*
p_longopts
;
struct
option
*
p_longopts
;
int
i_modules_index
;
int
i_modules_index
;
const
char
**
argv_copy
=
NULL
;
/* Short options */
/* Short options */
module_config_t
*
pp_shortopts
[
256
];
module_config_t
*
pp_shortopts
[
256
];
char
*
psz_shortopts
;
char
*
psz_shortopts
;
/* Set default configuration and copy arguments */
p_this
->
p_libvlc
->
i_argc
=
*
pi_argc
;
p_this
->
p_libvlc
->
ppsz_argv
=
ppsz_argv
;
#ifdef __APPLE__
#ifdef __APPLE__
/* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
/* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
* is the PSN - process serial number (a unique PID-ish thingie)
* is the PSN - process serial number (a unique PID-ish thingie)
...
@@ -154,8 +151,8 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
...
@@ -154,8 +151,8 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
* us, ignoring the arity of the options */
* us, ignoring the arity of the options */
if
(
b_ignore_errors
)
if
(
b_ignore_errors
)
{
{
ppsz_argv
=
(
const
char
**
)
malloc
(
*
pi_argc
*
sizeof
(
char
*
)
);
argv_copy
=
(
const
char
**
)
malloc
(
*
pi_argc
*
sizeof
(
char
*
)
);
if
(
ppsz_argv
==
NULL
)
if
(
argv_copy
==
NULL
)
{
{
msg_Err
(
p_this
,
"out of memory"
);
msg_Err
(
p_this
,
"out of memory"
);
free
(
psz_shortopts
);
free
(
psz_shortopts
);
...
@@ -163,8 +160,8 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
...
@@ -163,8 +160,8 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
vlc_list_release
(
p_list
);
vlc_list_release
(
p_list
);
return
-
1
;
return
-
1
;
}
}
memcpy
(
ppsz_argv
,
p_this
->
p_libvlc
->
ppsz_argv
,
memcpy
(
argv_copy
,
ppsz_argv
,
*
pi_argc
*
sizeof
(
char
*
)
);
*
pi_argc
*
sizeof
(
char
*
)
)
;
ppsz_argv
=
argv_copy
;
}
}
i_shortopts
=
0
;
i_shortopts
=
0
;
...
@@ -422,7 +419,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
...
@@ -422,7 +419,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
free
(
(
char
*
)
p_longopts
[
i_index
].
name
);
free
(
(
char
*
)
p_longopts
[
i_index
].
name
);
free
(
p_longopts
);
free
(
p_longopts
);
free
(
psz_shortopts
);
free
(
psz_shortopts
);
if
(
b_ignore_errors
)
free
(
ppsz_argv
);
free
(
argv_copy
);
return
0
;
return
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