aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2015-11-16 19:33:34 +0100
committerRainer Hochecker <fernetmenta@online.de>2015-12-06 20:33:54 +0100
commit071d9423d5dc0632f3505627f5adc73cea0d528e (patch)
treeb286b5db93508100756a726cf5feaa3034331b41 /lib
parentc31b7d374062f87c7512d9872cbceac920465913 (diff)
AE: move iec packing for passthrough into AE, contains squashed code from fritsch
Diffstat (limited to 'lib')
-rw-r--r--lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp b/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp
index 0d51941a2e..9387df226e 100644
--- a/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp
+++ b/lib/addons/library.kodi.audioengine/libKODI_audioengine.cpp
@@ -62,7 +62,7 @@ DLLEXPORT void AudioEngine_unregister_me(void *hdl, void* cb)
// ---------------------------------------------
// CAddonAEStream implementations
// ---------------------------------------------
-DLLEXPORT CAddonAEStream* AudioEngine_make_stream(void *hdl, void *cb, AEDataFormat DataFormat, unsigned int SampleRate, unsigned int EncodedSampleRate, enum AEChannel *Channels, unsigned int Options)
+DLLEXPORT CAddonAEStream* AudioEngine_make_stream(void *hdl, void *cb, AudioEngineFormat Format, unsigned int Options)
{
if (!hdl || !cb)
{
@@ -70,7 +70,7 @@ DLLEXPORT CAddonAEStream* AudioEngine_make_stream(void *hdl, void *cb, AEDataFor
return NULL;
}
- AEStreamHandle *streamHandle = ((CB_AudioEngineLib*)cb)->MakeStream(DataFormat, SampleRate, EncodedSampleRate, Channels, Options);
+ AEStreamHandle *streamHandle = ((CB_AudioEngineLib*)cb)->MakeStream(Format, Options);
if (!streamHandle)
{
fprintf(stderr, "%s-ERROR: AudioEngine_make_stream MakeStream failed!\n", LIBRARY_NAME);
@@ -209,11 +209,6 @@ const unsigned int CAddonAEStream::GetSampleRate() const
return ((CB_AudioEngineLib*)m_Callbacks)->AEStream_GetSampleRate(((AddonCB*)m_AddonHandle)->addonData, m_StreamHandle);
}
-const unsigned int CAddonAEStream::GetEncodedSampleRate() const
-{
- return ((CB_AudioEngineLib*)m_Callbacks)->AEStream_GetEncodedSampleRate(((AddonCB*)m_AddonHandle)->addonData, m_StreamHandle);
-}
-
const AEDataFormat CAddonAEStream::GetDataFormat() const
{
return ((CB_AudioEngineLib*)m_Callbacks)->AEStream_GetDataFormat(((AddonCB*)m_AddonHandle)->addonData, m_StreamHandle);