[vlc-commits] smooth: remove write-only variable
Rémi Denis-Courmont
git at videolan.org
Thu Jul 9 18:33:20 CEST 2015
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 9 18:46:05 2015 +0300| [d8f4b5c3aa4aad9804e2df2046300b0e21dc850e] | committer: Rémi Denis-Courmont
smooth: remove write-only variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8f4b5c3aa4aad9804e2df2046300b0e21dc850e
---
modules/stream_filter/smooth/downloader.c | 3 ---
modules/stream_filter/smooth/smooth.c | 3 ---
modules/stream_filter/smooth/smooth.h | 1 -
3 files changed, 7 deletions(-)
diff --git a/modules/stream_filter/smooth/downloader.c b/modules/stream_filter/smooth/downloader.c
index 1f878a7..e573dff 100644
--- a/modules/stream_filter/smooth/downloader.c
+++ b/modules/stream_filter/smooth/downloader.c
@@ -489,10 +489,7 @@ static int Download( stream_t *s, sms_stream_t *sms )
if( sms->p_chunks == NULL || sms->p_chunks == sms->p_lastchunk )
return VLC_SUCCESS;
- vlc_mutex_lock( &p_sys->playback.lock );
- p_sys->playback.b_underrun = false;
bw_stats_underrun( sms );
- vlc_mutex_unlock( &p_sys->playback.lock );
quality_level_t *new_qlevel = BandwidthAdaptation( s, sms, sms->i_obw,
duration );
diff --git a/modules/stream_filter/smooth/smooth.c b/modules/stream_filter/smooth/smooth.c
index 760f7d9..ddcbb63 100644
--- a/modules/stream_filter/smooth/smooth.c
+++ b/modules/stream_filter/smooth/smooth.c
@@ -690,9 +690,6 @@ static chunk_t *get_chunk( stream_t *s, const bool wait, bool *pb_isinit )
}
msg_Dbg( s, "get_chunk is waiting for chunk %"PRId64"!!!", p_chunk->start_time );
- vlc_mutex_lock( &p_sys->playback.lock );
- p_sys->playback.b_underrun = true;
- vlc_mutex_unlock( &p_sys->playback.lock );
vlc_cond_timedwait( &p_sys->playback.wait,
&p_sys->p_current_stream->chunks_lock, mdate() + CLOCK_FREQ/2 );
}
diff --git a/modules/stream_filter/smooth/smooth.h b/modules/stream_filter/smooth/smooth.h
index 1abeb7a..9a8f115 100644
--- a/modules/stream_filter/smooth/smooth.h
+++ b/modules/stream_filter/smooth/smooth.h
@@ -133,7 +133,6 @@ struct stream_sys_t
} init;
vlc_mutex_t lock;
vlc_cond_t wait; /* some condition to wait on */
- bool b_underrun; /* did we ran out of data recently */
} playback;
/* state */
More information about the vlc-commits
mailing list