Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
94757879
Commit
94757879
authored
Oct 16, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Qt] Remove QTimer wher we can.
parent
631f3415
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
5 additions
and
17 deletions
+5
-17
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+1
-0
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+2
-0
modules/gui/qt4/components/info_panels.cpp
modules/gui/qt4/components/info_panels.cpp
+1
-0
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/mediainfo.cpp
+0
-9
modules/gui/qt4/dialogs/mediainfo.hpp
modules/gui/qt4/dialogs/mediainfo.hpp
+0
-1
modules/gui/qt4/dialogs/messages.cpp
modules/gui/qt4/dialogs/messages.cpp
+1
-1
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+0
-3
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+0
-2
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+0
-1
No files found.
modules/gui/qt4/components/controller.cpp
View file @
94757879
...
...
@@ -49,6 +49,7 @@
#include <QResizeEvent>
#include <QDate>
#include <QSignalMapper>
#include <QTimer>
#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
...
...
modules/gui/qt4/components/controller.hpp
View file @
94757879
...
...
@@ -53,6 +53,8 @@ class QAbstractButton;
class
VolumeClickHandler
;
class
QSignalMapper
;
class
QTimer
;
typedef
enum
buttonType_e
{
PLAY_BUTTON
,
...
...
modules/gui/qt4/components/info_panels.cpp
View file @
94757879
...
...
@@ -546,6 +546,7 @@ InputStatsPanel::InputStatsPanel( QWidget *parent,
StatsTree
->
setColumnWidth
(
1
,
200
);
layout
->
addWidget
(
StatsTree
,
1
,
0
);
CONNECT
(
THEMIM
->
getIM
()
,
statisticsUpdated
(
input_item_t
*
),
this
,
update
(
input_item_t
*
)
);
}
...
...
modules/gui/qt4/dialogs/mediainfo.cpp
View file @
94757879
...
...
@@ -111,10 +111,6 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
if
(
p_item
)
update
(
p_item
,
true
,
true
);
if
(
stats
)
CONNECT
(
THEMIM
->
getIM
(),
statisticsUpdated
(
input_item_t
*
),
this
,
updateStats
(
input_item_t
*
));
readSettings
(
"Mediainfo"
,
QSize
(
600
,
480
)
);
}
...
...
@@ -161,11 +157,6 @@ void MediaInfoDialog::update( input_thread_t *p_input )
vlc_object_release
(
p_input
);
}
void
MediaInfoDialog
::
updateStats
(
input_item_t
*
p_input
)
{
update
(
p_input
,
false
,
false
);
}
void
MediaInfoDialog
::
update
(
input_item_t
*
p_item
,
bool
update_info
,
bool
update_meta
)
...
...
modules/gui/qt4/dialogs/mediainfo.hpp
View file @
94757879
...
...
@@ -86,7 +86,6 @@ public slots:
void
update
(
input_item_t
*
,
bool
,
bool
);
private
slots
:
void
updateStats
(
input_item_t
*
);
void
close
();
void
clear
();
void
saveMeta
();
...
...
modules/gui/qt4/dialogs/messages.cpp
View file @
94757879
...
...
@@ -64,7 +64,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
msgLayout
->
addWidget
(
messages
,
0
,
0
,
1
,
0
);
mainTab
->
addTab
(
msgWidget
,
qtr
(
"Messages"
)
);
ON_TIMEOUT
(
updateLog
()
);
//
ON_TIMEOUT( updateLog() );
/* Modules tree */
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
94757879
...
...
@@ -58,8 +58,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
QObject
(
NULL
),
p_intf
(
_p_intf
)
{
b_isDying
=
false
;
fixed_timer
=
new
QTimer
(
this
);
fixed_timer
->
start
(
150
/* milliseconds */
);
menusMapper
=
new
QSignalMapper
();
CONNECT
(
menusMapper
,
mapped
(
QObject
*
),
this
,
menuAction
(
QObject
*
)
);
...
...
@@ -85,7 +83,6 @@ DialogsProvider::~DialogsProvider()
UpdateDialog
::
killInstance
();
#endif
fixed_timer
->
stop
();
delete
menusMapper
;
delete
menusUpdateMapper
;
delete
SDMapper
;
...
...
modules/gui/qt4/dialogs_provider.hpp
View file @
94757879
...
...
@@ -38,7 +38,6 @@
#include "dialogs/open.hpp"
#include <QObject>
#include <QTimer>
#include <QApplication>
#define ADD_FILTER_MEDIA( string ) \
...
...
@@ -109,7 +108,6 @@ public:
return
(
instance
!=
NULL
);
}
virtual
~
DialogsProvider
();
QTimer
*
fixed_timer
;
QStringList
showSimpleOpen
(
QString
help
=
QString
(),
int
filters
=
EXT_FILTER_MEDIA
|
...
...
modules/gui/qt4/qt4.hpp
View file @
94757879
...
...
@@ -94,7 +94,6 @@ struct intf_sys_t
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
#define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout(), this, act )
#define BUTTON_SET( button, text, tooltip ) \
button->setText( text ); \
...
...
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