Browse Source

sout: sdi: don't pass the logger object to parseConfiguration()

The object is already passed to the SDIAudioMultiplex constructor and kept.

Fixes a variable shadowing of the obj variable.
pull/126/head
Steve Lhomme 5 years ago
committed by Jean-Baptiste Kempf
parent
commit
1b62cea5fc
  1. 4
      modules/stream_out/sdi/SDIAudioMultiplex.cpp
  2. 2
      modules/stream_out/sdi/SDIAudioMultiplex.hpp
  3. 2
      modules/stream_out/sdi/SDIOutput.cpp

4
modules/stream_out/sdi/SDIAudioMultiplex.cpp

@ -138,7 +138,7 @@ void SDIAudioMultiplexConfig::setSubFrameSlotUsed(uint8_t i)
subframeslotbitmap |= (1 << i);
}
void SDIAudioMultiplexConfig::parseConfiguration(vlc_object_t *obj, const char *psz)
void SDIAudioMultiplexConfig::parseConfiguration(const char *psz)
{
char *name = NULL;
char *psz_in = (char*)psz;
@ -367,7 +367,7 @@ const es_format_t *
}
SDIAudioMultiplex::SDIAudioMultiplex(vlc_object_t *obj, uint8_t channels)
: config(SDIAudioMultiplexConfig(obj, channels))
: config(obj, channels)
{
p_obj = obj;
head = VLC_TICK_INVALID;

2
modules/stream_out/sdi/SDIAudioMultiplex.hpp

@ -57,7 +57,7 @@ namespace sdi_sout
bool decode(const StreamID &) const;
bool SubFrameSlotUsed(uint8_t) const;
void setSubFrameSlotUsed(uint8_t);
void parseConfiguration(vlc_object_t *, const char *);
void parseConfiguration(const char *);
uint8_t getMultiplexedFramesCount() const { return framewidth; }
std::vector<uint8_t> getFreeSubFrameSlots(bool = false) const;
std::vector<uint8_t> getConfiguredSlots(const StreamID &) const;

2
modules/stream_out/sdi/SDIOutput.cpp

@ -59,7 +59,7 @@ SDIOutput::SDIOutput(sout_stream_t *p_stream_)
char *psz_channelsconf = var_InheritString(p_stream, CFG_PREFIX "audio");
if(psz_channelsconf)
{
audioMultiplex->config.parseConfiguration(VLC_OBJECT(p_stream), psz_channelsconf);
audioMultiplex->config.parseConfiguration(psz_channelsconf);
free(psz_channelsconf);
}
}

Loading…
Cancel
Save