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
8d6cfafb
Commit
8d6cfafb
authored
Jan 29, 2015
by
Jonathan Calmels
Committed by
Jean-Baptiste Kempf
Jan 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: inputChanged signal now takes the input_thread_t as parameter
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
0c59f960
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+1
-1
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+1
-1
modules/gui/qt4/extensions_manager.cpp
modules/gui/qt4/extensions_manager.cpp
+1
-1
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+4
-4
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+1
-1
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
8d6cfafb
...
@@ -493,7 +493,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
...
@@ -493,7 +493,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
/* Change the SpeedRate in the Label */
/* Change the SpeedRate in the Label */
CONNECT
(
THEMIM
->
getIM
(),
rateChanged
(
float
),
this
,
setRate
(
float
)
);
CONNECT
(
THEMIM
->
getIM
(),
rateChanged
(
float
),
this
,
setRate
(
float
)
);
DCONNECT
(
THEMIM
,
inputChanged
(
),
DCONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
speedControl
,
activateOnState
()
);
speedControl
,
activateOnState
()
);
setContentsMargins
(
4
,
0
,
4
,
0
);
setContentsMargins
(
4
,
0
,
4
,
0
);
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
8d6cfafb
...
@@ -59,7 +59,7 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
...
@@ -59,7 +59,7 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
rebuild
(
p_root
);
rebuild
(
p_root
);
DCONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
input_item_t
*
),
DCONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
input_item_t
*
),
this
,
processInputItemUpdate
(
input_item_t
*
)
);
this
,
processInputItemUpdate
(
input_item_t
*
)
);
DCONNECT
(
THEMIM
,
inputChanged
(
),
DCONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
this
,
processInputItemUpdate
(
)
);
this
,
processInputItemUpdate
(
)
);
CONNECT
(
THEMIM
,
playlistItemAppended
(
int
,
int
),
CONNECT
(
THEMIM
,
playlistItemAppended
(
int
,
int
),
this
,
processItemAppend
(
int
,
int
)
);
this
,
processItemAppend
(
int
,
int
)
);
...
...
modules/gui/qt4/extensions_manager.cpp
View file @
8d6cfafb
...
@@ -49,7 +49,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
...
@@ -49,7 +49,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
menuMapper
=
new
QSignalMapper
(
this
);
menuMapper
=
new
QSignalMapper
(
this
);
CONNECT
(
menuMapper
,
mapped
(
int
),
this
,
triggerMenu
(
int
)
);
CONNECT
(
menuMapper
,
mapped
(
int
),
this
,
triggerMenu
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingStatusChanged
(
int
),
this
,
playingChanged
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingStatusChanged
(
int
),
this
,
playingChanged
(
int
)
);
DCONNECT
(
THEMIM
,
inputChanged
(
),
DCONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
this
,
inputChanged
(
)
);
this
,
inputChanged
(
)
);
CONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
input_item_t
*
),
CONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
input_item_t
*
),
this
,
metaChanged
(
input_item_t
*
)
);
this
,
metaChanged
(
input_item_t
*
)
);
...
...
modules/gui/qt4/input_manager.cpp
View file @
8d6cfafb
...
@@ -1023,13 +1023,13 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
...
@@ -1023,13 +1023,13 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
mute
.
addCallback
(
this
,
SLOT
(
notifyMute
(
bool
))
);
mute
.
addCallback
(
this
,
SLOT
(
notifyMute
(
bool
))
);
/* Warn our embedded IM about input changes */
/* Warn our embedded IM about input changes */
DCONNECT
(
this
,
inputChanged
(),
DCONNECT
(
this
,
inputChanged
(
input_thread_t
*
),
im
,
inputChangedHandler
()
);
im
,
inputChangedHandler
()
);
/* initialize p_input (an input can already be running) */
/* initialize p_input (an input can already be running) */
p_input
=
playlist_CurrentInput
(
THEPL
);
p_input
=
playlist_CurrentInput
(
THEPL
);
if
(
p_input
)
if
(
p_input
)
emit
inputChanged
(
);
emit
inputChanged
(
p_input
);
/* Audio Menu */
/* Audio Menu */
menusAudioMapper
=
new
QSignalMapper
();
menusAudioMapper
=
new
QSignalMapper
();
...
@@ -1042,7 +1042,7 @@ MainInputManager::~MainInputManager()
...
@@ -1042,7 +1042,7 @@ MainInputManager::~MainInputManager()
{
{
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
p_input
=
NULL
;
p_input
=
NULL
;
emit
inputChanged
(
);
emit
inputChanged
(
NULL
);
}
}
var_DelCallback
(
THEPL
,
"activity"
,
PLItemChanged
,
this
);
var_DelCallback
(
THEPL
,
"activity"
,
PLItemChanged
,
this
);
...
@@ -1097,7 +1097,7 @@ void MainInputManager::customEvent( QEvent *event )
...
@@ -1097,7 +1097,7 @@ void MainInputManager::customEvent( QEvent *event )
if
(
p_input
!=
NULL
)
if
(
p_input
!=
NULL
)
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
p_input
=
playlist_CurrentInput
(
THEPL
);
p_input
=
playlist_CurrentInput
(
THEPL
);
emit
inputChanged
(
);
emit
inputChanged
(
p_input
);
}
}
/* Playlist Control functions */
/* Playlist Control functions */
...
...
modules/gui/qt4/input_manager.hpp
View file @
8d6cfafb
...
@@ -314,7 +314,7 @@ private slots:
...
@@ -314,7 +314,7 @@ private slots:
void
menusUpdateAudio
(
const
QString
&
);
void
menusUpdateAudio
(
const
QString
&
);
signals:
signals:
void
inputChanged
(
);
void
inputChanged
(
input_thread_t
*
);
void
volumeChanged
(
float
);
void
volumeChanged
(
float
);
void
soundMuteChanged
(
bool
);
void
soundMuteChanged
(
bool
);
void
playlistItemAppended
(
int
itemId
,
int
parentId
);
void
playlistItemAppended
(
int
itemId
,
int
parentId
);
...
...
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