Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
Steve Lhomme
VLC
Commits
b634e6a9
Commit
b634e6a9
authored
Feb 27, 2016
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comments about Qt4
parent
fd3b1b6c
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
bin/vlc.c
bin/vlc.c
+1
-1
include/vlc/libvlc_media_player.h
include/vlc/libvlc_media_player.h
+1
-1
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+1
-1
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+1
-1
modules/gui/skins2/src/dialogs.cpp
modules/gui/skins2/src/dialogs.cpp
+1
-1
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+1
-1
modules/stream_out/stats.c
modules/stream_out/stats.c
+1
-1
src/input/resource.c
src/input/resource.c
+1
-1
No files found.
bin/vlc.c
View file @
b634e6a9
...
@@ -246,7 +246,7 @@ int main( int i_argc, const char *ppsz_argv[] )
...
@@ -246,7 +246,7 @@ int main( int i_argc, const char *ppsz_argv[] )
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
);
libvlc_playlist_play
(
vlc
,
-
1
,
0
,
NULL
);
/* Qt
4
insists on catching SIGCHLD via signal handler. To work around that,
/* Qt insists on catching SIGCHLD via signal handler. To work around that,
* unblock it after all our child threads are created. */
* unblock it after all our child threads are created. */
sigdelset
(
&
set
,
SIGCHLD
);
sigdelset
(
&
set
,
SIGCHLD
);
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
NULL
);
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
NULL
);
...
...
include/vlc/libvlc_media_player.h
View file @
b634e6a9
...
@@ -429,7 +429,7 @@ void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp,
...
@@ -429,7 +429,7 @@ void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp,
*
*
* Or it can be an NSView object.
* Or it can be an NSView object.
*
*
* If you want to use it along with Qt
4
see the QMacCocoaViewContainer. Then
* If you want to use it along with Qt see the QMacCocoaViewContainer. Then
* the following code should work:
* the following code should work:
* @code{.mm}
* @code{.mm}
* {
* {
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
b634e6a9
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
{
{
NSUserDefaults
*
defaults
=
[
NSUserDefaults
standardUserDefaults
];
NSUserDefaults
*
defaults
=
[
NSUserDefaults
standardUserDefaults
];
/* We are using the same format as the Qt
4
intf here:
/* We are using the same format as the Qt intf here:
* Container(string), transcode video(bool), transcode audio(bool),
* Container(string), transcode video(bool), transcode audio(bool),
* use subtitles(bool), video codec(string), video bitrate(integer),
* use subtitles(bool), video codec(string), video bitrate(integer),
* scale(float), fps(float), width(integer, height(integer),
* scale(float), fps(float), width(integer, height(integer),
...
...
modules/gui/macosx/MainWindow.m
View file @
b634e6a9
...
@@ -334,7 +334,7 @@ static const float f_min_window_height = 307.;
...
@@ -334,7 +334,7 @@ static const float f_min_window_height = 307.;
SideBarItem
*
lanItem
=
[
SideBarItem
itemWithTitle
:
_NS
(
"LOCAL NETWORK"
)
identifier
:
@"localnetwork"
];
SideBarItem
*
lanItem
=
[
SideBarItem
itemWithTitle
:
_NS
(
"LOCAL NETWORK"
)
identifier
:
@"localnetwork"
];
SideBarItem
*
internetItem
=
[
SideBarItem
itemWithTitle
:
_NS
(
"INTERNET"
)
identifier
:
@"internet"
];
SideBarItem
*
internetItem
=
[
SideBarItem
itemWithTitle
:
_NS
(
"INTERNET"
)
identifier
:
@"internet"
];
/* SD subnodes, inspired by the Qt
4
intf */
/* SD subnodes, inspired by the Qt intf */
char
**
ppsz_longnames
=
NULL
;
char
**
ppsz_longnames
=
NULL
;
int
*
p_categories
=
NULL
;
int
*
p_categories
=
NULL
;
char
**
ppsz_names
=
vlc_sd_GetNames
(
pl_Get
(
getIntf
()),
&
ppsz_longnames
,
&
p_categories
);
char
**
ppsz_names
=
vlc_sd_GetNames
(
pl_Get
(
getIntf
()),
&
ppsz_longnames
,
&
p_categories
);
...
...
modules/gui/skins2/src/dialogs.cpp
View file @
b634e6a9
...
@@ -164,7 +164,7 @@ bool Dialogs::init()
...
@@ -164,7 +164,7 @@ bool Dialogs::init()
m_pModule
=
module_need
(
m_pProvider
,
"dialogs provider"
,
NULL
,
false
);
m_pModule
=
module_need
(
m_pProvider
,
"dialogs provider"
,
NULL
,
false
);
if
(
m_pModule
==
NULL
)
if
(
m_pModule
==
NULL
)
{
{
msg_Err
(
getIntf
(),
"no suitable dialogs provider found (hint: compile the qt
4
plugin, and make sure it is loaded properly)"
);
msg_Err
(
getIntf
(),
"no suitable dialogs provider found (hint: compile the qt plugin, and make sure it is loaded properly)"
);
vlc_object_release
(
m_pProvider
);
vlc_object_release
(
m_pProvider
);
m_pProvider
=
NULL
;
m_pProvider
=
NULL
;
return
false
;
return
false
;
...
...
modules/gui/skins2/src/skin_main.cpp
View file @
b634e6a9
...
@@ -245,7 +245,7 @@ static void *Run( void * p_obj )
...
@@ -245,7 +245,7 @@ static void *Run( void * p_obj )
}
}
if
(
Dialogs
::
instance
(
p_intf
)
==
NULL
)
if
(
Dialogs
::
instance
(
p_intf
)
==
NULL
)
{
{
msg_Err
(
p_intf
,
"cannot instantiate qt
4
dialogs provider"
);
msg_Err
(
p_intf
,
"cannot instantiate qt dialogs provider"
);
b_error
=
true
;
b_error
=
true
;
goto
end
;
goto
end
;
}
}
...
...
modules/stream_out/stats.c
View file @
b634e6a9
...
@@ -225,7 +225,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
...
@@ -225,7 +225,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
char
*
outputhash
=
psz_md5_hash
(
&
hash
);
char
*
outputhash
=
psz_md5_hash
(
&
hash
);
/* We could just set p_sys->output to stdout and remove user of msg_Dbg
/* We could just set p_sys->output to stdout and remove user of msg_Dbg
* if we don't need ability to output info to gui modules (like qt
4
messages window
* if we don't need ability to output info to gui modules (like qt messages window
*/
*/
mtime_t
dts_difference
=
VLC_TS_INVALID
;
mtime_t
dts_difference
=
VLC_TS_INVALID
;
if
(
likely
(
id
->
previous_dts
!=
VLC_TS_INVALID
)
)
if
(
likely
(
id
->
previous_dts
!=
VLC_TS_INVALID
)
)
...
...
src/input/resource.c
View file @
b634e6a9
...
@@ -61,7 +61,7 @@ struct input_resource_t
...
@@ -61,7 +61,7 @@ struct input_resource_t
/* This lock is used to protect vout resources access (for hold)
/* This lock is used to protect vout resources access (for hold)
* It is a special case because of embed video (possible deadlock
* It is a special case because of embed video (possible deadlock
* between vout window request and vout holds in some(qt
4
) interface)
* between vout window request and vout holds in some(qt) interface)
*/
*/
vlc_mutex_t
lock_hold
;
vlc_mutex_t
lock_hold
;
...
...
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