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
a1e5e642
Commit
a1e5e642
authored
Jul 02, 2014
by
Tristan Matthews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build for C++11
C++11 requires a space between literal and identifier
parent
92ec47e1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+2
-2
modules/gui/skins2/src/dialogs.cpp
modules/gui/skins2/src/dialogs.cpp
+1
-1
modules/video_filter/atmo/AtmoLiveView.cpp
modules/video_filter/atmo/AtmoLiveView.cpp
+2
-2
modules/video_filter/atmo/atmo.cpp
modules/video_filter/atmo/atmo.cpp
+1
-1
No files found.
modules/gui/qt4/components/extended_panels.cpp
View file @
a1e5e642
...
@@ -557,7 +557,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
...
@@ -557,7 +557,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
else
if
(
lineedit
)
else
if
(
lineedit
)
{
{
char
str
[
30
];
char
str
[
30
];
snprintf
(
str
,
sizeof
(
str
),
"%06"
PRIX64
,
val
.
i_int
);
snprintf
(
str
,
sizeof
(
str
),
"%06"
PRIX64
,
val
.
i_int
);
lineedit
->
setText
(
str
);
lineedit
->
setText
(
str
);
}
}
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
...
@@ -750,7 +750,7 @@ void ExtV4l2::Refresh( void )
...
@@ -750,7 +750,7 @@ void ExtV4l2::Refresh( void )
QString
name
=
qtr
(
vartext
.
psz_string
);
QString
name
=
qtr
(
vartext
.
psz_string
);
free
(
vartext
.
psz_string
);
free
(
vartext
.
psz_string
);
msg_Dbg
(
p_intf
,
"v4l2 control
\"
%"
PRIx64
"
\"
: %s (%s)"
,
msg_Dbg
(
p_intf
,
"v4l2 control
\"
%"
PRIx64
"
\"
: %s (%s)"
,
val
.
p_list
->
p_values
[
i
].
i_int
,
psz_var
,
qtu
(
name
)
);
val
.
p_list
->
p_values
[
i
].
i_int
,
psz_var
,
qtu
(
name
)
);
int
i_type
=
var_Type
(
p_obj
,
psz_var
);
int
i_type
=
var_Type
(
p_obj
,
psz_var
);
...
...
modules/gui/skins2/src/dialogs.cpp
View file @
a1e5e642
...
@@ -212,7 +212,7 @@ void Dialogs::showChangeSkin()
...
@@ -212,7 +212,7 @@ void Dialogs::showChangeSkin()
void
Dialogs
::
showPlaylistLoad
()
void
Dialogs
::
showPlaylistLoad
()
{
{
showFileGeneric
(
_
(
"Open playlist"
),
showFileGeneric
(
_
(
"Open playlist"
),
_
(
"Playlist Files|"
EXTENSIONS_PLAYLIST
"|"
_
(
"Playlist Files|"
EXTENSIONS_PLAYLIST
"|"
"All Files|*"
),
"All Files|*"
),
showPlaylistLoadCB
,
kOPEN
);
showPlaylistLoadCB
,
kOPEN
);
}
}
...
...
modules/video_filter/atmo/AtmoLiveView.cpp
View file @
a1e5e642
...
@@ -98,7 +98,7 @@ DWORD CAtmoLiveView::Execute(void)
...
@@ -98,7 +98,7 @@ DWORD CAtmoLiveView::Execute(void)
if
(
frameDelay
>
0
)
if
(
frameDelay
>
0
)
do_sleep
(
frameDelay
);
do_sleep
(
frameDelay
);
#if defined(_ATMO_VLC_PLUGIN_)
#if defined(_ATMO_VLC_PLUGIN_)
msg_Dbg
(
m_pLog
,
"First Packet got %"
PRId64
" ms"
,
(
get_time
-
t
)
/
1000
);
msg_Dbg
(
m_pLog
,
"First Packet got %"
PRId64
" ms"
,
(
get_time
-
t
)
/
1000
);
#endif
#endif
}
}
...
@@ -139,7 +139,7 @@ DWORD CAtmoLiveView::Execute(void)
...
@@ -139,7 +139,7 @@ DWORD CAtmoLiveView::Execute(void)
if
(
frameDelay
>
0
)
if
(
frameDelay
>
0
)
do_sleep
(
frameDelay
);
do_sleep
(
frameDelay
);
#if defined(_ATMO_VLC_PLUGIN_)
#if defined(_ATMO_VLC_PLUGIN_)
msg_Dbg
(
m_pLog
,
"got delayed packet %"
PRId64
" ms"
,
(
mdate
()
-
t
)
/
1000
);
msg_Dbg
(
m_pLog
,
"got delayed packet %"
PRId64
" ms"
,
(
mdate
()
-
t
)
/
1000
);
#endif
#endif
continue
;
continue
;
}
}
...
...
modules/video_filter/atmo/atmo.cpp
View file @
a1e5e642
...
@@ -2448,7 +2448,7 @@ static int AtmoSettingsCallback( vlc_object_t *, char const *psz_var,
...
@@ -2448,7 +2448,7 @@ static int AtmoSettingsCallback( vlc_object_t *, char const *psz_var,
if
(
p_atmo_config
)
if
(
p_atmo_config
)
{
{
msg_Dbg
(
p_filter
,
"apply AtmoSettingsCallback %s (int: %"
PRId64
" -> %"
PRId64
")"
,
msg_Dbg
(
p_filter
,
"apply AtmoSettingsCallback %s (int: %"
PRId64
" -> %"
PRId64
")"
,
psz_var
,
psz_var
,
oldval
.
i_int
,
oldval
.
i_int
,
newval
.
i_int
newval
.
i_int
...
...
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