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
ed9fae5e
Commit
ed9fae5e
authored
Mar 14, 2009
by
Erwan Tulou
Committed by
Rémi Denis-Courmont
Mar 17, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
at qt4 termination, ensure quit() function is executed in the right thread
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
0c2ad187
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
4 deletions
+23
-4
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+1
-0
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-1
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+2
-2
modules/gui/qt4/util/qvlcapp.hpp
modules/gui/qt4/util/qvlcapp.hpp
+19
-1
No files found.
modules/gui/qt4/Modules.am
View file @
ed9fae5e
...
...
@@ -57,6 +57,7 @@ nodist_SOURCES_qt4 = \
components/sout/sout_widgets.moc.cpp \
util/input_slider.moc.cpp \
util/customwidgets.moc.cpp \
util/qvlcapp.moc.cpp \
resources.cpp \
ui/equalizer.h \
ui/v4l2.h \
...
...
modules/gui/qt4/qt4.cpp
View file @
ed9fae5e
...
...
@@ -329,7 +329,7 @@ static void Close( vlc_object_t *p_this )
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
var_Destroy
(
p_this
->
p_libvlc
,
"qt4-iface"
);
Q
Application
::
q
uit
();
Q
VLCApp
::
triggerQ
uit
();
vlc_join
(
p_sys
->
thread
,
NULL
);
#ifdef Q_WS_X11
...
...
modules/gui/qt4/qt4.hpp
View file @
ed9fae5e
...
...
@@ -52,7 +52,7 @@ enum {
MsgEventType
=
300
,
};
class
Q
Application
;
class
Q
VLCApp
;
class
QMenu
;
class
MainInterface
;
class
QSettings
;
...
...
@@ -61,7 +61,7 @@ struct intf_sys_t
{
vlc_thread_t
thread
;
Q
Application
*
p_app
;
/* Main Qt Application */
Q
VLCApp
*
p_app
;
/* Main Qt Application */
MainInterface
*
p_mi
;
/* Main Interface, NULL if DialogProvider Mode */
QSettings
*
mainSettings
;
/* Qt State settings not messing main VLC ones */
...
...
modules/gui/qt4/util/qvlcapp.hpp
View file @
ed9fae5e
...
...
@@ -30,13 +30,26 @@
class
QVLCApp
:
public
QApplication
{
Q_OBJECT
public:
QVLCApp
(
int
&
argc
,
char
**
argv
)
:
QApplication
(
argc
,
argv
,
true
)
{
}
QVLCApp
(
int
&
argc
,
char
**
argv
)
:
QApplication
(
argc
,
argv
,
true
)
{
connect
(
this
,
SIGNAL
(
quitSignal
()),
this
,
SLOT
(
quit
())
);
}
static
void
triggerQuit
()
{
QVLCApp
*
app
=
qobject_cast
<
QVLCApp
*>
(
instance
()
);
if
(
app
)
emit
app
->
quitSignal
();
}
#if defined (Q_WS_X11)
QVLCApp
(
Display
*
dp
,
int
&
argc
,
char
**
argv
)
:
QApplication
(
dp
,
argc
,
argv
)
{
connect
(
this
,
SIGNAL
(
quitSignal
()),
this
,
SLOT
(
quit
())
);
}
#endif
...
...
@@ -54,6 +67,11 @@ protected:
return
false
;
}
#endif
signals:
void
quitSignal
();
};
#endif
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