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
7cd22823
Commit
7cd22823
authored
Jun 28, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix function name clash
parent
264f09b6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+8
-8
No files found.
modules/gui/qt4/qt4.cpp
View file @
7cd22823
...
...
@@ -54,8 +54,8 @@
static
int
Open
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
static
int
OpenDialogs
(
vlc_object_t
*
);
static
int
OpenWindow
(
vlc_object_t
*
);
static
void
CloseWindow
(
vlc_object_t
*
);
static
int
WindowOpen
(
vlc_object_t
*
);
static
void
WindowClose
(
vlc_object_t
*
);
static
void
Run
(
intf_thread_t
*
);
static
void
Init
(
intf_thread_t
*
);
static
void
ShowDialog
(
intf_thread_t
*
,
int
,
int
,
intf_dialog_args_t
*
);
...
...
@@ -210,7 +210,7 @@ vlc_module_begin();
add_submodule
();
set_capability
(
"vout window"
,
50
);
set_callbacks
(
OpenWindow
,
CloseWindow
);
set_callbacks
(
WindowOpen
,
WindowClose
);
vlc_module_end
();
/*****************************************************************************
...
...
@@ -461,9 +461,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
*/
#include <vlc_window.h>
static
int
ControlWindow
(
vout_window_t
*
,
int
,
va_list
);
static
int
WindowControl
(
vout_window_t
*
,
int
,
va_list
);
static
int
OpenWindow
(
vlc_object_t
*
obj
)
static
int
WindowOpen
(
vlc_object_t
*
obj
)
{
vout_window_t
*
wnd
=
(
vout_window_t
*
)
obj
;
...
...
@@ -504,12 +504,12 @@ static int OpenWindow (vlc_object_t *obj)
wnd
->
handle
=
(
*
miP
)
->
requestVideo
(
wnd
->
vout
,
&
wnd
->
pos_x
,
&
wnd
->
pos_y
,
&
wnd
->
width
,
&
wnd
->
height
);
windowLock
.
unlock
();
wnd
->
control
=
ControlWindow
;
wnd
->
control
=
WindowControl
;
wnd
->
p_private
=
miP
;
return
VLC_SUCCESS
;
}
static
int
ControlWindow
(
vout_window_t
*
wnd
,
int
query
,
va_list
args
)
static
int
WindowControl
(
vout_window_t
*
wnd
,
int
query
,
va_list
args
)
{
QPointer
<
MainInterface
>
*
miP
=
(
QPointer
<
MainInterface
>
*
)
wnd
->
p_private
;
QMutexLocker
locker
(
&
windowLock
);
...
...
@@ -519,7 +519,7 @@ static int ControlWindow (vout_window_t *wnd, int query, va_list args)
return
(
*
miP
)
->
controlVideo
(
wnd
->
handle
,
query
,
args
);
}
static
void
CloseWindow
(
vlc_object_t
*
obj
)
static
void
WindowClose
(
vlc_object_t
*
obj
)
{
vout_window_t
*
wnd
=
(
vout_window_t
*
)
obj
;
QPointer
<
MainInterface
>
*
miP
=
(
QPointer
<
MainInterface
>
*
)
wnd
->
p_private
;
...
...
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