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
eac9464c
Commit
eac9464c
authored
Oct 26, 2010
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: don't create multiple playlist models
parent
db8c66ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.cpp
+1
-1
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+4
-2
modules/gui/qt4/components/playlist/standardpanel.hpp
modules/gui/qt4/components/playlist/standardpanel.hpp
+1
-1
No files found.
modules/gui/qt4/components/playlist/playlist.cpp
View file @
eac9464c
...
@@ -90,7 +90,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
...
@@ -90,7 +90,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
setMinimumWidth
(
300
);
setMinimumWidth
(
300
);
PLModel
*
model
=
new
PLModel
(
p_playlist
,
p_intf
,
p_root
,
this
);
PLModel
*
model
=
new
PLModel
(
p_playlist
,
p_intf
,
p_root
,
this
);
mainView
=
new
StandardPLPanel
(
this
,
p_intf
,
THEPL
,
p_root
,
selector
);
mainView
=
new
StandardPLPanel
(
this
,
p_intf
,
THEPL
,
p_root
,
selector
,
model
);
/* Location Bar */
/* Location Bar */
locationBar
=
new
LocationBar
(
model
);
locationBar
=
new
LocationBar
(
model
);
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
eac9464c
...
@@ -59,7 +59,9 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
...
@@ -59,7 +59,9 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
intf_thread_t
*
_p_intf
,
intf_thread_t
*
_p_intf
,
playlist_t
*
p_playlist
,
playlist_t
*
p_playlist
,
playlist_item_t
*
p_root
,
playlist_item_t
*
p_root
,
PLSelector
*
_p_selector
)
:
PLSelector
*
_p_selector
,
PLModel
*
_p_model
)
:
QWidget
(
_parent
),
p_intf
(
_p_intf
),
QWidget
(
_parent
),
p_intf
(
_p_intf
),
p_selector
(
_p_selector
)
p_selector
(
_p_selector
)
{
{
...
@@ -73,7 +75,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
...
@@ -73,7 +75,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
viewStack
=
new
QStackedLayout
();
viewStack
=
new
QStackedLayout
();
layout
->
addLayout
(
viewStack
,
1
,
0
,
1
,
-
1
);
layout
->
addLayout
(
viewStack
,
1
,
0
,
1
,
-
1
);
model
=
new
PLModel
(
p_playlist
,
p_intf
,
p_root
,
this
)
;
model
=
_p_model
;
currentRootId
=
-
1
;
currentRootId
=
-
1
;
currentRootIndexId
=
-
1
;
currentRootIndexId
=
-
1
;
lastActivatedId
=
-
1
;
lastActivatedId
=
-
1
;
...
...
modules/gui/qt4/components/playlist/standardpanel.hpp
View file @
eac9464c
...
@@ -59,7 +59,7 @@ class StandardPLPanel: public QWidget
...
@@ -59,7 +59,7 @@ class StandardPLPanel: public QWidget
public:
public:
StandardPLPanel
(
PlaylistWidget
*
,
intf_thread_t
*
,
StandardPLPanel
(
PlaylistWidget
*
,
intf_thread_t
*
,
playlist_t
*
,
playlist_item_t
*
,
PLSelector
*
);
playlist_t
*
,
playlist_item_t
*
,
PLSelector
*
,
PLModel
*
);
virtual
~
StandardPLPanel
();
virtual
~
StandardPLPanel
();
protected:
protected:
friend
class
PlaylistWidget
;
friend
class
PlaylistWidget
;
...
...
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