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
0c8124fd
Commit
0c8124fd
authored
Aug 13, 2009
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: change metaChanged signal from id to input_item_t*
parent
685788f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+6
-6
modules/gui/qt4/components/playlist/playlist_model.hpp
modules/gui/qt4/components/playlist/playlist_model.hpp
+1
-1
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+3
-3
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+2
-2
No files found.
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
0c8124fd
...
@@ -94,8 +94,8 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
...
@@ -94,8 +94,8 @@ PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
#undef ADD_ICON
#undef ADD_ICON
rebuild
(
p_root
);
rebuild
(
p_root
);
CONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
in
t
),
CONNECT
(
THEMIM
->
getIM
(),
metaChanged
(
in
put_item_t
*
),
this
,
ProcessInputItemUpdate
(
in
t
)
);
this
,
ProcessInputItemUpdate
(
in
put_item_t
*
)
);
CONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
CONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
this
,
ProcessInputItemUpdate
(
input_thread_t
*
)
);
this
,
ProcessInputItemUpdate
(
input_thread_t
*
)
);
}
}
...
@@ -572,17 +572,17 @@ void PLModel::customEvent( QEvent *event )
...
@@ -572,17 +572,17 @@ void PLModel::customEvent( QEvent *event )
void
PLModel
::
ProcessInputItemUpdate
(
input_thread_t
*
p_input
)
void
PLModel
::
ProcessInputItemUpdate
(
input_thread_t
*
p_input
)
{
{
if
(
!
p_input
)
return
;
if
(
!
p_input
)
return
;
ProcessInputItemUpdate
(
input_GetItem
(
p_input
)
->
i_id
);
ProcessInputItemUpdate
(
input_GetItem
(
p_input
)
);
if
(
p_input
&&
!
(
p_input
->
b_dead
||
!
vlc_object_alive
(
p_input
)
)
)
if
(
p_input
&&
!
(
p_input
->
b_dead
||
!
vlc_object_alive
(
p_input
)
)
)
{
{
PLItem
*
item
=
FindByInput
(
rootItem
,
input_GetItem
(
p_input
)
->
i_id
);
PLItem
*
item
=
FindByInput
(
rootItem
,
input_GetItem
(
p_input
)
->
i_id
);
emit
currentChanged
(
index
(
item
,
0
)
);
emit
currentChanged
(
index
(
item
,
0
)
);
}
}
}
}
void
PLModel
::
ProcessInputItemUpdate
(
in
t
i_input_id
)
void
PLModel
::
ProcessInputItemUpdate
(
in
put_item_t
*
p_item
)
{
{
if
(
i_input
_id
<=
0
)
return
;
if
(
!
p_item
||
p_item
->
i
_id
<=
0
)
return
;
PLItem
*
item
=
FindByInput
(
rootItem
,
i_input
_id
);
PLItem
*
item
=
FindByInput
(
rootItem
,
p_item
->
i
_id
);
if
(
item
)
if
(
item
)
{
{
QPL_LOCK
;
QPL_LOCK
;
...
...
modules/gui/qt4/components/playlist/playlist_model.hpp
View file @
0c8124fd
...
@@ -186,7 +186,7 @@ private slots:
...
@@ -186,7 +186,7 @@ private slots:
void
popupSave
();
void
popupSave
();
void
popupExplore
();
void
popupExplore
();
void
viewchanged
(
int
);
void
viewchanged
(
int
);
void
ProcessInputItemUpdate
(
in
t
i_input_id
);
void
ProcessInputItemUpdate
(
in
put_item_t
*
);
void
ProcessInputItemUpdate
(
input_thread_t
*
p_input
);
void
ProcessInputItemUpdate
(
input_thread_t
*
p_input
);
};
};
...
...
modules/gui/qt4/input_manager.cpp
View file @
0c8124fd
...
@@ -151,7 +151,7 @@ void InputManager::customEvent( QEvent *event )
...
@@ -151,7 +151,7 @@ void InputManager::customEvent( QEvent *event )
IMEvent
*
ple
=
static_cast
<
IMEvent
*>
(
event
);
IMEvent
*
ple
=
static_cast
<
IMEvent
*>
(
event
);
if
(
i_type
==
ItemChanged_Type
)
if
(
i_type
==
ItemChanged_Type
)
UpdateMeta
(
ple
->
p_item
->
i_id
);
UpdateMeta
(
ple
->
p_item
);
if
(
!
hasInput
()
)
if
(
!
hasInput
()
)
return
;
return
;
...
@@ -616,9 +616,9 @@ inline void InputManager::UpdateStats()
...
@@ -616,9 +616,9 @@ inline void InputManager::UpdateStats()
emit
statisticsUpdated
(
input_GetItem
(
p_input
)
);
emit
statisticsUpdated
(
input_GetItem
(
p_input
)
);
}
}
inline
void
InputManager
::
UpdateMeta
(
in
t
id
)
inline
void
InputManager
::
UpdateMeta
(
in
put_item_t
*
p_item
)
{
{
emit
metaChanged
(
id
);
emit
metaChanged
(
p_item
);
}
}
inline
void
InputManager
::
UpdateMeta
()
inline
void
InputManager
::
UpdateMeta
()
...
...
modules/gui/qt4/input_manager.hpp
View file @
0c8124fd
...
@@ -137,7 +137,7 @@ private:
...
@@ -137,7 +137,7 @@ private:
void
UpdateArt
();
void
UpdateArt
();
void
UpdateInfo
();
void
UpdateInfo
();
void
UpdateMeta
();
void
UpdateMeta
();
void
UpdateMeta
(
in
t
);
void
UpdateMeta
(
in
put_item_t
*
);
void
UpdateVout
();
void
UpdateVout
();
void
UpdateAout
();
void
UpdateAout
();
void
UpdateStats
();
void
UpdateStats
();
...
@@ -186,7 +186,7 @@ signals:
...
@@ -186,7 +186,7 @@ signals:
void
statisticsUpdated
(
input_item_t
*
);
void
statisticsUpdated
(
input_item_t
*
);
void
infoChanged
(
input_item_t
*
);
void
infoChanged
(
input_item_t
*
);
void
currentMetaChanged
(
input_item_t
*
);
void
currentMetaChanged
(
input_item_t
*
);
void
metaChanged
(
in
t
);
void
metaChanged
(
in
put_item_t
*
);
void
artChanged
(
QString
);
void
artChanged
(
QString
);
/// Play/pause status
/// Play/pause status
void
statusChanged
(
int
);
void
statusChanged
(
int
);
...
...
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