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
175b37db
Commit
175b37db
authored
May 09, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: fix build with --disable-media-library
Sorry for the problem.
parent
6296dd70
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.cpp
+4
-0
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+4
-0
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+4
-0
No files found.
modules/gui/qt4/components/playlist/playlist.cpp
View file @
175b37db
...
...
@@ -94,8 +94,12 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
setMinimumWidth
(
400
);
PLModel
*
model
=
new
PLModel
(
p_playlist
,
p_intf
,
p_root
,
this
);
#ifdef MEDIA_LIBRARY
MLModel
*
mlmodel
=
new
MLModel
(
p_intf
,
this
);
mainView
=
new
StandardPLPanel
(
this
,
p_intf
,
p_root
,
selector
,
model
,
mlmodel
);
#else
mainView
=
new
StandardPLPanel
(
this
,
p_intf
,
p_root
,
selector
,
model
,
NULL
);
#endif
/* Location Bar */
locationBar
=
new
LocationBar
(
model
);
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
175b37db
...
...
@@ -195,12 +195,14 @@ void StandardPLPanel::searchDelayed( const QString& searchText )
/* This activated by the selector selection */
void
StandardPLPanel
::
setRoot
(
playlist_item_t
*
p_item
,
bool
b
)
{
#ifdef MEDIA_LIBRARY
if
(
b
)
{
msg_Dbg
(
p_intf
,
"Setting the SQL ML"
);
currentView
->
setModel
(
mlmodel
);
}
else
#endif
{
msg_Dbg
(
p_intf
,
"Normal PL/ML or SD"
);
if
(
currentView
->
model
()
!=
model
)
...
...
@@ -354,6 +356,7 @@ void StandardPLPanel::createTreeView()
void
StandardPLPanel
::
changeModel
(
bool
b_ml
)
{
#ifdef MEDIA_LIBRARY
VLCModel
*
mod
;
if
(
b_ml
)
mod
=
mlmodel
;
...
...
@@ -361,6 +364,7 @@ void StandardPLPanel::changeModel( bool b_ml )
mod
=
model
;
if
(
currentView
->
model
()
!=
mod
)
currentView
->
setModel
(
mod
);
#endif
}
void
StandardPLPanel
::
showView
(
int
i_view
)
...
...
modules/gui/qt4/components/simple_preferences.cpp
View file @
175b37db
...
...
@@ -549,7 +549,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui
.
assoButton
->
hide
();
ui
.
assocLabel
->
hide
();
#endif
#ifdef MEDIA_LIBRARY
BUTTONACT
(
ui
.
sqlMLbtn
,
configML
()
);
#endif
/* interface */
char
*
psz_intf
=
config_GetPsz
(
p_intf
,
"intf"
);
...
...
@@ -891,9 +893,11 @@ void SPrefsPanel::changeStyle( QString s_style )
void
SPrefsPanel
::
configML
()
{
#ifdef MEDIA_LIBRARY
MLConfDialog
*
mld
=
new
MLConfDialog
(
this
,
p_intf
);
mld
->
exec
();
delete
mld
;
#endif
}
#ifdef WIN32
...
...
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