fixed HDMI channel mapping and stream type (reported by Rüdiger Follmann)

3 files changed, 7 insertions, 6 deletions

diff --git a/HISTORY b/HISTORY
index 2d5137c..6bfd8de 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,7 @@ VDR Plugin 'rpihddevice' Revision History
   - set device name
   - add option for dual display usage, see README
 - fixed:
+  - fixed HDMI channel mapping and stream type (reported by Rüdiger Follmann)
   - fixed drawing of cached images with high level OSD
   - only cache images in GPU when high level OSD is active
   - added proper GPL header to every source file (suggested by Tobias Grimm)
diff --git a/audio.c b/audio.c
index a5e1fb6..835333b 100644
--- a/audio.c
+++ b/audio.c
@@ -1085,6 +1085,10 @@ private:
 
 		if (m_codec != cAudioCodec::eInvalid)
 		{
+			if (m_port == cRpiAudioPort::eHDMI)
+				cRpiSetup::SetHDMIChannelMapping(m_codec != cAudioCodec::ePCM,
+						m_outChannels);
+
 			m_omx->SetupAudioRender(m_codec, m_outChannels, m_port,
 					m_samplingRate, m_frameSize);
 
@@ -1093,10 +1097,6 @@ private:
 					cAudioCodec::Str(m_codec),
 					m_samplingRate / 1000, (m_samplingRate % 1000) / 100,
 					m_codec != cAudioCodec::ePCM ? " (pass-through)" : "");
-
-			if (m_port == cRpiAudioPort::eHDMI)
-				cRpiSetup::SetHDMIChannelMapping(m_codec != cAudioCodec::ePCM,
-						m_outChannels);
 		}
 		m_running = m_codec != cAudioCodec::eInvalid;
 		m_configured = true;
diff --git a/setup.c b/setup.c
index 6b030f9..99b90d6 100644
--- a/setup.c
+++ b/setup.c
@@ -255,7 +255,7 @@ void cRpiSetup::SetHDMIChannelMapping(bool passthrough, int channels)
 	char command[80], response[80];
 
 	sprintf(command, "hdmi_stream_channels %d", passthrough ? 1 : 0);
-	vc_gencmd(response, sizeof response, command);
+	vc_gencmd(response, sizeof(response), command);
 
 	uint32_t channel_map = 0;
 
@@ -290,7 +290,7 @@ void cRpiSetup::SetHDMIChannelMapping(bool passthrough, int channels)
 	}
 
 	sprintf(command, "hdmi_channel_map 0x%08x", channel_map);
-	vc_gencmd(response, sizeof response, command);
+	vc_gencmd(response, sizeof(response), command);
 }
 
 cMenuSetupPage* cRpiSetup::GetSetupPage(void)