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
f63b74c6
Commit
f63b74c6
authored
Mar 21, 2007
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4.cpp: Put it at a better place, only under X11, remove debug
parent
434a7e5e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+7
-9
No files found.
modules/gui/qt4/qt4.cpp
View file @
f63b74c6
...
@@ -68,6 +68,13 @@ static int Open( vlc_object_t *p_this )
...
@@ -68,6 +68,13 @@ static int Open( vlc_object_t *p_this )
{
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
p_intf
->
pf_run
=
Run
;
p_intf
->
pf_run
=
Run
;
#if defined HAVE_GETENV && defined Q_WS_X11
if
(
!
getenv
(
"DISPLAY"
)
)
{
msg_Err
(
p_intf
,
"no X server"
);
return
VLC_EGENERIC
;
}
#endif
p_intf
->
p_sys
=
(
intf_sys_t
*
)
malloc
(
sizeof
(
intf_sys_t
)
);
p_intf
->
p_sys
=
(
intf_sys_t
*
)
malloc
(
sizeof
(
intf_sys_t
)
);
if
(
!
p_intf
->
p_sys
)
if
(
!
p_intf
->
p_sys
)
{
{
...
@@ -75,13 +82,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -75,13 +82,6 @@ static int Open( vlc_object_t *p_this )
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
memset
(
p_intf
->
p_sys
,
0
,
sizeof
(
intf_sys_t
)
);
memset
(
p_intf
->
p_sys
,
0
,
sizeof
(
intf_sys_t
)
);
#ifdef HAVE_GETENV
if
(
!
getenv
(
"DISPLAY"
)
)
{
msg_Err
(
p_intf
,
"no X server"
);
return
VLC_EGENERIC
;
}
#endif
p_intf
->
p_sys
->
p_playlist
=
pl_Yield
(
p_intf
);
p_intf
->
p_sys
->
p_playlist
=
pl_Yield
(
p_intf
);
p_intf
->
p_sys
->
p_sub
=
msg_Subscribe
(
p_intf
,
MSG_QUEUE_NORMAL
);
p_intf
->
p_sys
->
p_sub
=
msg_Subscribe
(
p_intf
,
MSG_QUEUE_NORMAL
);
...
@@ -131,9 +131,7 @@ static void Init( intf_thread_t *p_intf )
...
@@ -131,9 +131,7 @@ static void Init( intf_thread_t *p_intf )
char
*
argv
[]
=
{
""
};
char
*
argv
[]
=
{
""
};
int
argc
=
1
;
int
argc
=
1
;
Q_INIT_RESOURCE
(
vlc
);
Q_INIT_RESOURCE
(
vlc
);
msg_Err
(
p_intf
,
"before Qapplication constructor"
);
QApplication
*
app
=
new
QApplication
(
argc
,
argv
,
true
);
QApplication
*
app
=
new
QApplication
(
argc
,
argv
,
true
);
msg_Err
(
p_intf
,
"after constructoe"
);
app
->
setWindowIcon
(
QIcon
(
QPixmap
(
vlc_xpm
)
)
);
app
->
setWindowIcon
(
QIcon
(
QPixmap
(
vlc_xpm
)
)
);
p_intf
->
p_sys
->
p_app
=
app
;
p_intf
->
p_sys
->
p_app
=
app
;
...
...
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