Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
e62ab5fc
Commit
e62ab5fc
authored
Nov 12, 2016
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove stray "album-art" variable usage
The variable value is always zero as of
bdc3ad38
. Simplify accordingly.
parent
5c36c934
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
21 deletions
+6
-21
include/vlc_meta.h
include/vlc_meta.h
+0
-8
modules/access/cdda.c
modules/access/cdda.c
+1
-2
modules/gui/qt/components/playlist/vlc_model.cpp
modules/gui/qt/components/playlist/vlc_model.cpp
+1
-2
modules/gui/qt/dialogs/firstrun.cpp
modules/gui/qt/dialogs/firstrun.cpp
+0
-3
src/playlist/engine.c
src/playlist/engine.c
+0
-1
src/playlist/fetcher.c
src/playlist/fetcher.c
+4
-5
No files found.
include/vlc_meta.h
View file @
e62ab5fc
...
...
@@ -97,14 +97,6 @@ VLC_API void vlc_meta_SetStatus( vlc_meta_t *m, int status );
*/
VLC_API
const
char
*
vlc_meta_TypeToLocalizedString
(
vlc_meta_type_t
meta_type
);
/* deprecated (album-art variable) */
enum
{
ALBUM_ART_WHEN_ASKED
,
ALBUM_ART_WHEN_PLAYED
,
ALBUM_ART_ALL
};
typedef
struct
meta_export_t
{
VLC_COMMON_MEMBERS
...
...
modules/access/cdda.c
View file @
e62ab5fc
...
...
@@ -259,8 +259,7 @@ struct access_sys_t
#ifdef HAVE_LIBCDDB
static
cddb_disc_t
*
GetCDDBInfo
(
vlc_object_t
*
obj
,
int
i_titles
,
int
*
p_sectors
)
{
if
(
var_InheritInteger
(
obj
,
"album-art"
)
!=
ALBUM_ART_ALL
&&
!
var_InheritBool
(
obj
,
"metadata-network-access"
)
)
if
(
!
var_InheritBool
(
obj
,
"metadata-network-access"
)
)
{
msg_Dbg
(
obj
,
"album art policy set to manual: not fetching"
);
return
NULL
;
...
...
modules/gui/qt/components/playlist/vlc_model.cpp
View file @
e62ab5fc
...
...
@@ -196,9 +196,8 @@ void VLCModel::ensureArtRequested( const QModelIndex &index )
{
if
(
index
.
isValid
()
&&
hasChildren
(
index
)
)
{
int
i_art_policy
=
var_GetInteger
(
THEPL
,
"album-art"
);
bool
b_access
=
var_InheritBool
(
THEPL
,
"metadata-network-access"
);
if
(
i_art_policy
!=
ALBUM_ART_ALL
&&
!
b_access
)
return
;
if
(
!
b_access
)
return
;
int
nbnodes
=
rowCount
(
index
);
QModelIndex
child
;
for
(
int
row
=
0
;
row
<
nbnodes
;
row
++
)
...
...
modules/gui/qt/dialogs/firstrun.cpp
View file @
e62ab5fc
...
...
@@ -37,9 +37,6 @@ FirstRun::FirstRun( QWidget *_p, intf_thread_t *_p_intf )
setVisible
(
true
);
}
#define ALBUM_ART_WHEN_ASKED 0
#define ALBUM_ART_ALL 2
void
FirstRun
::
save
()
{
config_PutInt
(
p_intf
,
"metadata-network-access"
,
checkbox
->
isChecked
()
);
...
...
src/playlist/engine.c
View file @
e62ab5fc
...
...
@@ -466,7 +466,6 @@ static void VariablesInit( playlist_t *p_playlist )
var_Create
(
p_playlist
,
"demux-filter"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
/* */
var_Create
(
p_playlist
,
"album-art"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_playlist
,
"metadata-network-access"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
/* Variables to preserve video output parameters */
...
...
src/playlist/fetcher.c
View file @
e62ab5fc
...
...
@@ -108,11 +108,10 @@ playlist_fetcher_t *playlist_fetcher_New( vlc_object_t *parent )
vlc_cond_init
(
&
p_fetcher
->
wait
);
p_fetcher
->
b_live
=
false
;
bool
b_access
=
var_InheritBool
(
parent
,
"metadata-network-access"
);
if
(
!
b_access
)
b_access
=
(
var_InheritInteger
(
parent
,
"album-art"
)
==
ALBUM_ART_ALL
);
p_fetcher
->
e_scope
=
(
b_access
)
?
FETCHER_SCOPE_ANY
:
FETCHER_SCOPE_LOCAL
;
if
(
var_InheritBool
(
parent
,
"metadata-network-access"
)
)
p_fetcher
->
e_scope
=
FETCHER_SCOPE_ANY
;
else
p_fetcher
->
e_scope
=
FETCHER_SCOPE_LOCAL
;
memset
(
p_fetcher
->
p_waiting_head
,
0
,
PASS_COUNT
*
sizeof
(
fetcher_entry_t
*
)
);
memset
(
p_fetcher
->
p_waiting_tail
,
0
,
PASS_COUNT
*
sizeof
(
fetcher_entry_t
*
)
);
...
...
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