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
10029dae
Commit
10029dae
authored
Feb 25, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: remove debug and cosmetics
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
f327c96f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
15 deletions
+10
-15
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+10
-12
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+0
-3
No files found.
modules/gui/qt4/main_interface.cpp
View file @
10029dae
...
@@ -124,7 +124,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -124,7 +124,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
i_visualmode
=
var_InheritInteger
(
p_intf
,
"qt-display-mode"
);
i_visualmode
=
var_InheritInteger
(
p_intf
,
"qt-display-mode"
);
/* Do we want anoying popups or not */
/* Do we want anoying popups or not */
notificationEnabled
=
(
bool
)
var_InheritBool
(
p_intf
,
"qt-notification"
);
notificationEnabled
=
var_InheritBool
(
p_intf
,
"qt-notification"
);
/* Set the other interface settings */
/* Set the other interface settings */
settings
=
getSettings
();
settings
=
getSettings
();
...
@@ -213,15 +213,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -213,15 +213,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* END CONNECTS ON IM */
/* END CONNECTS ON IM */
/************
* Callbacks
************/
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-show"
,
IntfShowCB
,
p_intf
);
/* Register callback for the intf-popupmenu variable */
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
/* VideoWidget connects for asynchronous calls */
/* VideoWidget connects for asynchronous calls */
connect
(
this
,
SIGNAL
(
askGetVideo
(
WId
*
,
int
*
,
int
*
,
unsigned
*
,
unsigned
*
)),
connect
(
this
,
SIGNAL
(
askGetVideo
(
WId
*
,
int
*
,
int
*
,
unsigned
*
,
unsigned
*
)),
this
,
SLOT
(
getVideoSlot
(
WId
*
,
int
*
,
int
*
,
unsigned
*
,
unsigned
*
)),
this
,
SLOT
(
getVideoSlot
(
WId
*
,
int
*
,
int
*
,
unsigned
*
,
unsigned
*
)),
...
@@ -251,6 +242,15 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -251,6 +242,15 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/** END of CONNECTS**/
/** END of CONNECTS**/
/************
* Callbacks
************/
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-show"
,
IntfShowCB
,
p_intf
);
/* Register callback for the intf-popupmenu variable */
var_AddCallback
(
p_intf
->
p_libvlc
,
"intf-popupmenu"
,
PopupMenuCB
,
p_intf
);
/**** FINAL SIZING and placement of interface */
/**** FINAL SIZING and placement of interface */
settings
->
beginGroup
(
"MainWindow"
);
settings
->
beginGroup
(
"MainWindow"
);
QVLCTools
::
restoreWidgetPosition
(
settings
,
this
,
QSize
(
380
,
60
)
);
QVLCTools
::
restoreWidgetPosition
(
settings
,
this
,
QSize
(
380
,
60
)
);
...
@@ -298,8 +298,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -298,8 +298,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
MainInterface
::~
MainInterface
()
MainInterface
::~
MainInterface
()
{
{
msg_Dbg
(
p_intf
,
"Destroying the main interface"
);
/* Unsure we hide the videoWidget before destroying it */
/* Unsure we hide the videoWidget before destroying it */
if
(
stackCentralOldState
==
VIDEO_TAB
)
if
(
stackCentralOldState
==
VIDEO_TAB
)
showBg
();
showBg
();
...
...
modules/gui/qt4/qt4.cpp
View file @
10029dae
...
@@ -471,15 +471,12 @@ static void *Thread( void *obj )
...
@@ -471,15 +471,12 @@ static void *Thread( void *obj )
app
.
exec
();
app
.
exec
();
/* And quit */
/* And quit */
msg_Dbg
(
p_intf
,
"Quitting the Qt4 Interface"
);
QApplication
::
closeAllWindows
();
QApplication
::
closeAllWindows
();
if
(
p_mi
!=
NULL
)
if
(
p_mi
!=
NULL
)
{
{
/* FIXME: are we sure that video window is already destroyed? */
/* FIXME: are we sure that video window is already destroyed? */
msg_Dbg
(
p_intf
,
"destroying the main Qt4 interface"
);
p_intf
->
p_sys
->
p_mi
=
NULL
;
p_intf
->
p_sys
->
p_mi
=
NULL
;
/* Destroy first the main interface because it is connected to some
/* Destroy first the main interface because it is connected to some
slots in the MainInputManager */
slots in the MainInputManager */
...
...
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