Commit 7da95868 authored by Thomas Guillem's avatar Thomas Guillem

chromecast: remove useless variable

parent 8446d627
...@@ -90,7 +90,8 @@ struct sout_stream_sys_t ...@@ -90,7 +90,8 @@ struct sout_stream_sys_t
bool canDecodeAudio( sout_stream_t* p_stream, vlc_fourcc_t i_codec, bool canDecodeAudio( sout_stream_t* p_stream, vlc_fourcc_t i_codec,
const audio_format_t* p_fmt ) const; const audio_format_t* p_fmt ) const;
bool startSoutChain(sout_stream_t* p_stream, bool startSoutChain(sout_stream_t* p_stream,
const std::vector<sout_stream_id_sys_t*> &new_streams); const std::vector<sout_stream_id_sys_t*> &new_streams,
const std::string &sout);
void stopSoutChain(sout_stream_t* p_stream); void stopSoutChain(sout_stream_t* p_stream);
int handleChromecastState(sout_stream_t* p_stream); int handleChromecastState(sout_stream_t* p_stream);
...@@ -98,7 +99,6 @@ struct sout_stream_sys_t ...@@ -98,7 +99,6 @@ struct sout_stream_sys_t
sout_access_out_sys_t access_out_live; sout_access_out_sys_t access_out_live;
sout_stream_t *p_out; sout_stream_t *p_out;
std::string sout;
const std::string default_muxer; const std::string default_muxer;
const std::string default_mime; const std::string default_mime;
std::string mime; std::string mime;
...@@ -573,7 +573,6 @@ static void DelInternal(sout_stream_t *p_stream, sout_stream_id_sys_t *id, ...@@ -573,7 +573,6 @@ static void DelInternal(sout_stream_t *p_stream, sout_stream_id_sys_t *id,
p_sys->stopSoutChain(p_stream); p_sys->stopSoutChain(p_stream);
p_sys->p_intf->requestPlayerStop(); p_sys->p_intf->requestPlayerStop();
p_sys->access_out_live.clear(); p_sys->access_out_live.clear();
p_sys->sout = "";
p_sys->transcode_attempt_idx = 0; p_sys->transcode_attempt_idx = 0;
p_sys->drained = false; p_sys->drained = false;
} }
...@@ -652,7 +651,8 @@ void sout_stream_sys_t::stopSoutChain(sout_stream_t *p_stream) ...@@ -652,7 +651,8 @@ void sout_stream_sys_t::stopSoutChain(sout_stream_t *p_stream)
} }
bool sout_stream_sys_t::startSoutChain(sout_stream_t *p_stream, bool sout_stream_sys_t::startSoutChain(sout_stream_t *p_stream,
const std::vector<sout_stream_id_sys_t*> &new_streams) const std::vector<sout_stream_id_sys_t*> &new_streams,
const std::string &sout)
{ {
stopSoutChain( p_stream ); stopSoutChain( p_stream );
...@@ -887,16 +887,13 @@ bool sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream ) ...@@ -887,16 +887,13 @@ bool sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream )
<< "http{mux=" << default_muxer << "http{mux=" << default_muxer
<< ",access=chromecast-http"; << ",access=chromecast-http";
sout = ssout.str(); if ( !startSoutChain( p_stream, new_streams, ssout.str() ) )
if ( !startSoutChain( p_stream, new_streams ) )
{ {
p_intf->requestPlayerStop(); p_intf->requestPlayerStop();
sout_StreamChainDelete( p_out, NULL ); sout_StreamChainDelete( p_out, NULL );
access_out_live.clear(); access_out_live.clear();
p_out = NULL; p_out = NULL;
sout = "";
} }
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment