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
37f2e008
Commit
37f2e008
authored
Aug 16, 2009
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: remove basicly empty PLItem::update and refactor playlist_model UpdateTreeItem-methods
parent
02ff4f49
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
21 deletions
+2
-21
modules/gui/qt4/components/playlist/playlist_item.cpp
modules/gui/qt4/components/playlist/playlist_item.cpp
+0
-7
modules/gui/qt4/components/playlist/playlist_item.hpp
modules/gui/qt4/components/playlist/playlist_item.hpp
+0
-2
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+2
-11
modules/gui/qt4/components/playlist/playlist_model.hpp
modules/gui/qt4/components/playlist/playlist_model.hpp
+0
-1
No files found.
modules/gui/qt4/components/playlist/playlist_item.cpp
View file @
37f2e008
...
@@ -102,10 +102,3 @@ int PLItem::row() const
...
@@ -102,10 +102,3 @@ int PLItem::row() const
return
0
;
return
0
;
}
}
/* update the PL Item, get the good names and so on */
void
PLItem
::
update
(
playlist_item_t
*
p_item
)
{
assert
(
p_item
->
p_input
==
p_input
);
}
modules/gui/qt4/components/playlist/playlist_item.hpp
View file @
37f2e008
...
@@ -59,8 +59,6 @@ public:
...
@@ -59,8 +59,6 @@ public:
PLItem
*
parent
()
{
return
parentItem
;
};
PLItem
*
parent
()
{
return
parentItem
;
};
void
update
(
playlist_item_t
*
);
protected:
protected:
QList
<
PLItem
*>
children
;
QList
<
PLItem
*>
children
;
int
i_id
;
int
i_id
;
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
37f2e008
...
@@ -723,7 +723,7 @@ void PLModel::ProcessItemAppend( const playlist_add_t *p_add )
...
@@ -723,7 +723,7 @@ void PLModel::ProcessItemAppend( const playlist_add_t *p_add )
nodeItem
->
appendChild
(
newItem
);
nodeItem
->
appendChild
(
newItem
);
emit
endInsertRows
();
emit
endInsertRows
();
emit
layoutChanged
();
emit
layoutChanged
();
UpdateTreeItem
(
p_item
,
newItem
,
true
);
UpdateTreeItem
(
newItem
,
true
);
end:
end:
PL_UNLOCK
;
PL_UNLOCK
;
return
;
return
;
...
@@ -772,8 +772,7 @@ void PLModel::rebuild( playlist_item_t *p_root )
...
@@ -772,8 +772,7 @@ void PLModel::rebuild( playlist_item_t *p_root )
p_item
->
p_input
->
i_id
);
p_item
->
p_input
->
i_id
);
if
(
currentItem
)
if
(
currentItem
)
{
{
UpdateTreeItem
(
p_item
,
currentItem
,
UpdateTreeItem
(
currentItem
,
true
,
false
);
true
,
false
);
}
}
}
}
else
else
...
@@ -816,19 +815,11 @@ void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
...
@@ -816,19 +815,11 @@ void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
void
PLModel
::
UpdateTreeItem
(
PLItem
*
item
,
bool
signal
,
bool
force
)
void
PLModel
::
UpdateTreeItem
(
PLItem
*
item
,
bool
signal
,
bool
force
)
{
{
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
item
->
i_id
);
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
item
->
i_id
);
UpdateTreeItem
(
p_item
,
item
,
signal
,
force
);
}
/* This function must be entered WITH the playlist lock */
void
PLModel
::
UpdateTreeItem
(
playlist_item_t
*
p_item
,
PLItem
*
item
,
bool
signal
,
bool
force
)
{
if
(
!
p_item
)
if
(
!
p_item
)
return
;
return
;
if
(
!
force
&&
i_depth
==
DEPTH_SEL
&&
p_item
->
p_parent
&&
if
(
!
force
&&
i_depth
==
DEPTH_SEL
&&
p_item
->
p_parent
&&
p_item
->
p_parent
->
i_id
!=
rootItem
->
i_id
)
p_item
->
p_parent
->
i_id
!=
rootItem
->
i_id
)
return
;
return
;
item
->
update
(
p_item
);
if
(
signal
)
if
(
signal
)
emit
dataChanged
(
index
(
item
,
0
)
,
index
(
item
,
columnCount
(
QModelIndex
()
)
)
);
emit
dataChanged
(
index
(
item
,
0
)
,
index
(
item
,
columnCount
(
QModelIndex
()
)
)
);
}
}
...
...
modules/gui/qt4/components/playlist/playlist_model.hpp
View file @
37f2e008
...
@@ -146,7 +146,6 @@ private:
...
@@ -146,7 +146,6 @@ private:
void
ProcessItemAppend
(
const
playlist_add_t
*
p_add
);
void
ProcessItemAppend
(
const
playlist_add_t
*
p_add
);
void
UpdateTreeItem
(
PLItem
*
,
bool
,
bool
force
=
false
);
void
UpdateTreeItem
(
PLItem
*
,
bool
,
bool
force
=
false
);
void
UpdateTreeItem
(
playlist_item_t
*
,
PLItem
*
,
bool
,
bool
forc
=
false
);
void
UpdateNodeChildren
(
PLItem
*
);
void
UpdateNodeChildren
(
PLItem
*
);
void
UpdateNodeChildren
(
playlist_item_t
*
,
PLItem
*
);
void
UpdateNodeChildren
(
playlist_item_t
*
,
PLItem
*
);
...
...
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