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
d5d50e2f
Commit
d5d50e2f
authored
Aug 16, 2009
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: no need to store input-type, as we can get it from p_input in playlist_model
parent
a45d4754
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
7 deletions
+2
-7
modules/gui/qt4/components/playlist/playlist_item.cpp
modules/gui/qt4/components/playlist/playlist_item.cpp
+0
-4
modules/gui/qt4/components/playlist/playlist_item.hpp
modules/gui/qt4/components/playlist/playlist_item.hpp
+0
-1
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+2
-2
No files found.
modules/gui/qt4/components/playlist/playlist_item.cpp
View file @
d5d50e2f
...
...
@@ -53,7 +53,6 @@ void PLItem::init( playlist_item_t *_playlist_item, PLItem *parent, PLModel *m,
parentItem
=
parent
;
/* Can be NULL, but only for the rootItem */
i_id
=
_playlist_item
->
i_id
;
/* Playlist item specific id */
model
=
m
;
/* PLModel (QAbsmodel) */
i_type
=
-
1
;
/* Item type - Avoid segfault */
p_input
=
_playlist_item
->
p_input
;
vlc_gc_incref
(
p_input
);
...
...
@@ -119,8 +118,5 @@ void PLItem::update( playlist_item_t *p_item )
{
assert
(
p_item
->
p_input
==
p_input
);
/* Useful for the model */
i_type
=
p_item
->
p_input
->
i_type
;
}
modules/gui/qt4/components/playlist/playlist_item.hpp
View file @
d5d50e2f
...
...
@@ -63,7 +63,6 @@ public:
protected:
QList
<
PLItem
*>
children
;
int
i_type
;
int
i_id
;
input_item_t
*
p_input
;
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
d5d50e2f
...
...
@@ -390,8 +390,8 @@ QVariant PLModel::data( const QModelIndex &index, int role ) const
else
if
(
role
==
Qt
::
DecorationRole
&&
index
.
column
()
==
0
)
{
/* Use to segfault here because i_type wasn't always initialized */
if
(
item
->
i_type
>=
0
)
return
QVariant
(
PLModel
::
icons
[
item
->
i_type
]
);
if
(
item
->
p_input
->
i_type
>=
0
)
return
QVariant
(
PLModel
::
icons
[
item
->
p_input
->
i_type
]
);
}
else
if
(
role
==
Qt
::
FontRole
)
{
...
...
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