Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
4842d4ca
Commit
4842d4ca
authored
20 years ago
by
gbazin
Browse files
Options
Downloads
Patches
Plain Diff
* src/playlist/*: a couple of compilation fixes.
parent
a0ffcd86
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/playlist/item.c
+2
-2
2 additions, 2 deletions
src/playlist/item.c
src/playlist/playlist.c
+2
-2
2 additions, 2 deletions
src/playlist/playlist.c
src/playlist/view.c
+5
-5
5 additions, 5 deletions
src/playlist/view.c
with
9 additions
and
9 deletions
src/playlist/item.c
+
2
−
2
View file @
4842d4ca
...
...
@@ -246,7 +246,7 @@ int playlist_ItemSetDuration( playlist_item_t *p_item, mtime_t i_duration )
p_item
->
input
.
i_duration
=
i_duration
;
if
(
i_duration
!=
-
1
)
{
secstotimestr
(
psz_buffer
,
i_duration
/
1000000
);
secstotimestr
(
psz_buffer
,
(
int
)(
i_duration
/
1000000
)
);
}
else
{
...
...
@@ -291,5 +291,5 @@ static void GuessType( input_item_t *p_item)
return
;
}
}
return
ITEM_TYPE_UNKNOWN
;
p_item
->
i_type
=
ITEM_TYPE_UNKNOWN
;
}
This diff is collapsed.
Click to expand it.
src/playlist/playlist.c
+
2
−
2
View file @
4842d4ca
...
...
@@ -221,11 +221,11 @@ int playlist_Control( playlist_t * p_playlist, int i_query, ... )
int
playlist_vaControl
(
playlist_t
*
p_playlist
,
int
i_query
,
va_list
args
)
{
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
playlist_view_t
*
p_view
;
vlc_value_t
val
;
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
#ifdef PLAYLIST_PROFILE
p_playlist
->
request_date
=
mdate
();
#endif
...
...
This diff is collapsed.
Click to expand it.
src/playlist/view.c
+
5
−
5
View file @
4842d4ca
...
...
@@ -90,7 +90,8 @@ playlist_view_t * playlist_ViewCreate( playlist_t *p_playlist, int i_id,
*/
int
playlist_ViewInsert
(
playlist_t
*
p_playlist
,
int
i_id
,
char
*
psz_name
)
{
playlist_view_t
*
p_view
=
playlist_ViewCreate
(
p_playlist
,
i_id
,
psz_name
);
playlist_view_t
*
p_view
=
playlist_ViewCreate
(
p_playlist
,
i_id
,
psz_name
);
if
(
!
p_view
)
{
msg_Err
(
p_playlist
,
"Creation failed"
);
...
...
@@ -99,12 +100,11 @@ int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name )
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
INSERT_ELEM
(
p_playlist
->
pp_views
,
p_playlist
->
i_views
,
p_playlist
->
i_views
,
p_view
);
INSERT_ELEM
(
p_playlist
->
pp_views
,
p_playlist
->
i_views
,
p_playlist
->
i_views
,
p_view
);
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
return
VLC_SUCCESS
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment