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
2a305595
Commit
2a305595
authored
Jul 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smooth: remove/propagate constant value
From the downloader thread, b_close is always true.
parent
872a08d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
11 deletions
+1
-11
modules/stream_filter/smooth/downloader.c
modules/stream_filter/smooth/downloader.c
+1
-9
modules/stream_filter/smooth/smooth.c
modules/stream_filter/smooth/smooth.c
+0
-1
modules/stream_filter/smooth/smooth.h
modules/stream_filter/smooth/smooth.h
+0
-1
No files found.
modules/stream_filter/smooth/downloader.c
View file @
2a305595
...
@@ -639,7 +639,7 @@ void* sms_Thread( void *p_this )
...
@@ -639,7 +639,7 @@ void* sms_Thread( void *p_this )
}
}
vlc_cond_signal
(
&
p_sys
->
playback
.
wait
);
vlc_cond_signal
(
&
p_sys
->
playback
.
wait
);
while
(
!
p_sys
->
b_close
)
for
(
;;
)
{
{
if
(
!
p_sys
->
b_live
||
!
p_sys
->
download
.
lookahead_count
)
if
(
!
p_sys
->
b_live
||
!
p_sys
->
download
.
lookahead_count
)
stream_Control
(
s
,
STREAM_GET_PTS_DELAY
,
&
i_pts_delay
);
stream_Control
(
s
,
STREAM_GET_PTS_DELAY
,
&
i_pts_delay
);
...
@@ -650,14 +650,6 @@ void* sms_Thread( void *p_this )
...
@@ -650,14 +650,6 @@ void* sms_Thread( void *p_this )
i_pts_delay
)
)
i_pts_delay
)
)
{
{
vlc_cond_wait
(
&
p_sys
->
download
.
wait
,
&
p_sys
->
lock
);
vlc_cond_wait
(
&
p_sys
->
download
.
wait
,
&
p_sys
->
lock
);
if
(
p_sys
->
b_close
)
break
;
}
if
(
p_sys
->
b_close
)
{
vlc_mutex_unlock
(
&
p_sys
->
lock
);
break
;
}
}
sms_stream_t
*
sms
=
next_download_stream
(
p_sys
);
sms_stream_t
*
sms
=
next_download_stream
(
p_sys
);
...
...
modules/stream_filter/smooth/smooth.c
View file @
2a305595
...
@@ -558,7 +558,6 @@ static void Close( vlc_object_t *p_this )
...
@@ -558,7 +558,6 @@ static void Close( vlc_object_t *p_this )
stream_t
*
s
=
(
stream_t
*
)
p_this
;
stream_t
*
s
=
(
stream_t
*
)
p_this
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
p_sys
->
b_close
=
true
;
vlc_cond_signal
(
&
p_sys
->
download
.
wait
);
vlc_cond_signal
(
&
p_sys
->
download
.
wait
);
vlc_join
(
p_sys
->
download
.
thread
,
NULL
);
vlc_join
(
p_sys
->
download
.
thread
,
NULL
);
...
...
modules/stream_filter/smooth/smooth.h
View file @
2a305595
...
@@ -136,7 +136,6 @@ struct stream_sys_t
...
@@ -136,7 +136,6 @@ struct stream_sys_t
/* state */
/* state */
bool
b_live
;
/* live stream? or vod? */
bool
b_live
;
/* live stream? or vod? */
bool
b_close
;
/* set by Close() */
};
};
#define SMS_GET_SELECTED_ST( cat ) \
#define SMS_GET_SELECTED_ST( cat ) \
...
...
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