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
bfa0a5e1
Commit
bfa0a5e1
authored
Feb 18, 2011
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: MIM: Make use of singleton
parent
ad6c671f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
16 deletions
+3
-16
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+0
-1
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+3
-15
No files found.
modules/gui/qt4/input_manager.cpp
View file @
bfa0a5e1
...
...
@@ -939,7 +939,6 @@ void InputManager::AtoBLoop( float, int64_t i_time, int )
* take care of updating the main playlist input.
* Used in the main playlist Dialog
**********************************************************************/
MainInputManager
*
MainInputManager
::
instance
=
NULL
;
MainInputManager
::
MainInputManager
(
intf_thread_t
*
_p_intf
)
:
QObject
(
NULL
),
p_intf
(
_p_intf
)
...
...
modules/gui/qt4/input_manager.hpp
View file @
bfa0a5e1
...
...
@@ -32,6 +32,7 @@
#include <vlc_input.h>
#include "qt4.hpp"
#include "util/singleton.hpp"
#include <QObject>
#include <QEvent>
...
...
@@ -241,22 +242,11 @@ signals:
void
epgChanged
();
};
class
MainInputManager
:
public
QObject
class
MainInputManager
:
public
QObject
,
public
Singleton
<
MainInputManager
>
{
Q_OBJECT
friend
class
Singleton
<
MainInputManager
>
;
public:
static
MainInputManager
*
getInstance
(
intf_thread_t
*
_p_intf
)
{
if
(
!
instance
)
instance
=
new
MainInputManager
(
_p_intf
);
return
instance
;
}
static
void
killInstance
()
{
delete
instance
;
instance
=
NULL
;
}
input_thread_t
*
getInput
()
{
return
p_input
;
}
InputManager
*
getIM
()
{
return
im
;
}
inline
input_item_t
*
currentInputItem
()
...
...
@@ -272,8 +262,6 @@ private:
MainInputManager
(
intf_thread_t
*
);
virtual
~
MainInputManager
();
static
MainInputManager
*
instance
;
void
customEvent
(
QEvent
*
);
InputManager
*
im
;
...
...
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