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
4a45faa9
Commit
4a45faa9
authored
Apr 15, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless display pointer
parent
39fb462a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-6
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+0
-3
No files found.
modules/gui/qt4/qt4.cpp
View file @
4a45faa9
...
@@ -278,6 +278,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -278,6 +278,7 @@ static int Open( vlc_object_t *p_this )
msg_Err
(
p_intf
,
"Could not connect to X server"
);
msg_Err
(
p_intf
,
"Could not connect to X server"
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
XCloseDisplay
(
p_display
);
#endif
#endif
/* Allocations of p_sys */
/* Allocations of p_sys */
...
@@ -286,9 +287,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -286,9 +287,6 @@ static int Open( vlc_object_t *p_this )
p_sys
->
p_popup_menu
=
NULL
;
p_sys
->
p_popup_menu
=
NULL
;
p_sys
->
p_mi
=
NULL
;
p_sys
->
p_mi
=
NULL
;
p_sys
->
p_playlist
=
pl_Hold
(
p_intf
);
p_sys
->
p_playlist
=
pl_Hold
(
p_intf
);
#ifdef Q_WS_X11
p_sys
->
display
=
p_display
;
#endif
/* */
/* */
if
(
vlc_clone
(
&
p_sys
->
thread
,
Thread
,
p_intf
,
VLC_THREAD_PRIORITY_LOW
)
)
if
(
vlc_clone
(
&
p_sys
->
thread
,
Thread
,
p_intf
,
VLC_THREAD_PRIORITY_LOW
)
)
...
@@ -335,9 +333,6 @@ static void Close( vlc_object_t *p_this )
...
@@ -335,9 +333,6 @@ static void Close( vlc_object_t *p_this )
QVLCApp
::
triggerQuit
();
QVLCApp
::
triggerQuit
();
vlc_join
(
p_sys
->
thread
,
NULL
);
vlc_join
(
p_sys
->
thread
,
NULL
);
#ifdef Q_WS_X11
XCloseDisplay
((
Display
*
)
p_sys
->
display
);
#endif
pl_Release
(
p_this
);
pl_Release
(
p_this
);
delete
p_sys
;
delete
p_sys
;
}
}
...
...
modules/gui/qt4/qt4.hpp
View file @
4a45faa9
...
@@ -75,9 +75,6 @@ struct intf_sys_t
...
@@ -75,9 +75,6 @@ struct intf_sys_t
const
char
*
psz_filepath
;
/* Last path used in dialogs */
const
char
*
psz_filepath
;
/* Last path used in dialogs */
QMenu
*
p_popup_menu
;
/* The right click menu */
QMenu
*
p_popup_menu
;
/* The right click menu */
#ifdef Q_WS_X11
/* WTH is this included in ALL files? :( */
void
*
display
;
#endif
};
};
#define THEPL p_intf->p_sys->p_playlist
#define THEPL p_intf->p_sys->p_playlist
...
...
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