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
b6c60944
Commit
b6c60944
authored
Oct 14, 2007
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed meta-preparsed variable.
Audioscrobbler is not fixed but I let a comment explaining how to do it.
parent
481e0b5b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
modules/misc/audioscrobbler.c
modules/misc/audioscrobbler.c
+4
-0
src/input/input.c
src/input/input.c
+13
-6
src/input/var.c
src/input/var.c
+0
-3
No files found.
modules/misc/audioscrobbler.c
View file @
b6c60944
...
@@ -571,9 +571,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
...
@@ -571,9 +571,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
}
}
else
else
{
{
#if 0
/* XXX this won't work. One way would be to monitor p_input "state",
* once it is no more INIT_S, meta should be parsed */
/* We'll read the meta data when it will be preparsed */
/* We'll read the meta data when it will be preparsed */
var_AddCallback( p_input, "meta-preparsed", MetaPreparsed, p_intf );
var_AddCallback( p_input, "meta-preparsed", MetaPreparsed, p_intf );
p_sys->b_preparsed_cb = VLC_TRUE;
p_sys->b_preparsed_cb = VLC_TRUE;
#endif
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
src/input/input.c
View file @
b6c60944
...
@@ -199,12 +199,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
...
@@ -199,12 +199,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
/* Create Object Variables for private use only */
/* Create Object Variables for private use only */
input_ConfigVarInit
(
p_input
);
input_ConfigVarInit
(
p_input
);
vlc_mutex_lock
(
&
p_item
->
lock
);
if
(
p_item
->
p_meta
&&
(
p_item
->
p_meta
->
i_status
&
ITEM_PREPARSED
)
)
var_SetBool
(
p_input
,
"meta-preparsed"
,
VLC_TRUE
);
vlc_mutex_unlock
(
&
p_item
->
lock
);
/* Create Objects variables for public Get and Set */
/* Create Objects variables for public Get and Set */
input_ControlVarInit
(
p_input
);
input_ControlVarInit
(
p_input
);
...
@@ -2650,6 +2644,19 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d
...
@@ -2650,6 +2644,19 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d
vlc_bool_t
b_bool
;
vlc_bool_t
b_bool
;
module_t
*
p_id3
;
module_t
*
p_id3
;
#if 0
/* XXX I am not sure it is a great idea, besides, there is more than that
* if we want to do it right */
vlc_mutex_lock( &p_item->lock );
if( p_item->p_meta && (p_item->p_meta->i_status & ITEM_PREPARSED ) )
{
vlc_mutex_unlock( &p_item->lock );
return;
}
vlc_mutex_unlock( &p_item->lock );
#endif
demux2_Control
(
p_demux
,
DEMUX_GET_META
,
p_meta
);
demux2_Control
(
p_demux
,
DEMUX_GET_META
,
p_meta
);
if
(
demux2_Control
(
p_demux
,
DEMUX_HAS_UNSUPPORTED_META
,
&
b_bool
)
)
if
(
demux2_Control
(
p_demux
,
DEMUX_HAS_UNSUPPORTED_META
,
&
b_bool
)
)
return
;
return
;
...
...
src/input/var.c
View file @
b6c60944
...
@@ -463,9 +463,6 @@ void input_ConfigVarInit ( input_thread_t *p_input )
...
@@ -463,9 +463,6 @@ void input_ConfigVarInit ( input_thread_t *p_input )
var_Create
(
p_input
,
"meta-description"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-description"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-date"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-date"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-url"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-url"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_input
,
"meta-preparsed"
,
VLC_VAR_BOOL
);
var_SetBool
(
p_input
,
"meta-preparsed"
,
VLC_FALSE
);
}
}
/*****************************************************************************
/*****************************************************************************
...
...
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