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
14d3718f
Commit
14d3718f
authored
Mar 10, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: remove trailing space
parent
2c613666
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/input/meta.c
src/input/meta.c
+8
-8
No files found.
src/input/meta.c
View file @
14d3718f
...
@@ -40,9 +40,9 @@
...
@@ -40,9 +40,9 @@
struct
vlc_meta_t
struct
vlc_meta_t
{
{
char
*
ppsz_meta
[
VLC_META_TYPE_COUNT
];
char
*
ppsz_meta
[
VLC_META_TYPE_COUNT
];
vlc_dictionary_t
extra_tags
;
vlc_dictionary_t
extra_tags
;
int
i_status
;
int
i_status
;
};
};
...
@@ -78,7 +78,7 @@ const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type )
...
@@ -78,7 +78,7 @@ const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type )
/**
/**
* vlc_meta contructor.
* vlc_meta contructor.
* vlc_meta_Delete() will free the returned pointer.
* vlc_meta_Delete() will free the returned pointer.
*/
*/
vlc_meta_t
*
vlc_meta_New
(
void
)
vlc_meta_t
*
vlc_meta_New
(
void
)
{
{
vlc_meta_t
*
m
=
(
vlc_meta_t
*
)
malloc
(
sizeof
(
*
m
)
);
vlc_meta_t
*
m
=
(
vlc_meta_t
*
)
malloc
(
sizeof
(
*
m
)
);
...
@@ -110,7 +110,7 @@ void vlc_meta_Delete( vlc_meta_t *m )
...
@@ -110,7 +110,7 @@ void vlc_meta_Delete( vlc_meta_t *m )
* vlc_meta has two kinds of meta, the one in a table, and the one in a
* vlc_meta has two kinds of meta, the one in a table, and the one in a
* dictionary.
* dictionary.
* FIXME - Why don't we merge those two?
* FIXME - Why don't we merge those two?
*/
*/
void
vlc_meta_Set
(
vlc_meta_t
*
p_meta
,
vlc_meta_type_t
meta_type
,
const
char
*
psz_val
)
void
vlc_meta_Set
(
vlc_meta_t
*
p_meta
,
vlc_meta_type_t
meta_type
,
const
char
*
psz_val
)
{
{
...
@@ -168,10 +168,10 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
...
@@ -168,10 +168,10 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
{
{
char
**
ppsz_all_keys
;
char
**
ppsz_all_keys
;
int
i
;
int
i
;
if
(
!
dst
||
!
src
)
if
(
!
dst
||
!
src
)
return
;
return
;
for
(
i
=
0
;
i
<
VLC_META_TYPE_COUNT
;
i
++
)
for
(
i
=
0
;
i
<
VLC_META_TYPE_COUNT
;
i
++
)
{
{
if
(
src
->
ppsz_meta
[
i
]
)
if
(
src
->
ppsz_meta
[
i
]
)
...
@@ -180,14 +180,14 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
...
@@ -180,14 +180,14 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
dst
->
ppsz_meta
[
i
]
=
strdup
(
src
->
ppsz_meta
[
i
]
);
dst
->
ppsz_meta
[
i
]
=
strdup
(
src
->
ppsz_meta
[
i
]
);
}
}
}
}
/* XXX: If speed up are needed, it is possible */
/* XXX: If speed up are needed, it is possible */
ppsz_all_keys
=
vlc_dictionary_all_keys
(
&
src
->
extra_tags
);
ppsz_all_keys
=
vlc_dictionary_all_keys
(
&
src
->
extra_tags
);
for
(
i
=
0
;
ppsz_all_keys
&&
ppsz_all_keys
[
i
];
i
++
)
for
(
i
=
0
;
ppsz_all_keys
&&
ppsz_all_keys
[
i
];
i
++
)
{
{
/* Always try to remove the previous value */
/* Always try to remove the previous value */
vlc_dictionary_remove_value_for_key
(
&
dst
->
extra_tags
,
ppsz_all_keys
[
i
],
vlc_meta_FreeExtraKey
,
NULL
);
vlc_dictionary_remove_value_for_key
(
&
dst
->
extra_tags
,
ppsz_all_keys
[
i
],
vlc_meta_FreeExtraKey
,
NULL
);
void
*
p_value
=
vlc_dictionary_value_for_key
(
&
src
->
extra_tags
,
ppsz_all_keys
[
i
]
);
void
*
p_value
=
vlc_dictionary_value_for_key
(
&
src
->
extra_tags
,
ppsz_all_keys
[
i
]
);
vlc_dictionary_insert
(
&
dst
->
extra_tags
,
ppsz_all_keys
[
i
],
strdup
(
(
const
char
*
)
p_value
)
);
vlc_dictionary_insert
(
&
dst
->
extra_tags
,
ppsz_all_keys
[
i
],
strdup
(
(
const
char
*
)
p_value
)
);
free
(
ppsz_all_keys
[
i
]
);
free
(
ppsz_all_keys
[
i
]
);
...
...
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