actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Loops plus minor improvements.

Browse Source
This commit is contained in:
Jason Felds
2013-04-30 23:11:53 -04:00
parent 0897ce48e4
commit 0bd79b9984
1 changed files with 1409 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Sound/RageSoundDriver_WDMKS.cpp
+17 -17
View File
@@ -721,13 +721,12 @@ WinWdmPin *WinWdmFilter::InstantiateRenderPin(
*/ */
vector<int> aSampleRates; vector<int> aSampleRates;
{ {
for( size_t j = 0; j < m_apPins.size(); ++j ) for (WinWdmPin *pPin : m_apPins)
{ {
WinWdmPin *pPin = m_apPins[j]; for (KSDATARANGE_AUDIO const &range : pPin->m_dataRangesItem)
FOREACH_CONST( KSDATARANGE_AUDIO, pPin->m_dataRangesItem, range )
{ {
aSampleRates.push_back( range->MinimumSampleFrequency ); aSampleRates.push_back( range.MinimumSampleFrequency );
aSampleRates.push_back( range->MaximumSampleFrequency ); aSampleRates.push_back( range.MaximumSampleFrequency );
} }
} }
@@ -1287,26 +1286,27 @@ RString RageSoundDriver_WDMKS::Init()
{ {
const WinWdmFilter *pFilter = apFilters[i]; const WinWdmFilter *pFilter = apFilters[i];
LOG->Trace( "Device #%i: %s", i, pFilter->m_sFriendlyName.c_str() ); LOG->Trace( "Device #%i: %s", i, pFilter->m_sFriendlyName.c_str() );
for( size_t j = 0; j < pFilter->m_apPins.size(); ++j ) int j = 0;
for (WinWdmPin *pPin : pFilter->m_apPins)
{ {
WinWdmPin *pPin = pFilter->m_apPins[j]; LOG->Trace( " Pin %i", j++ );
LOG->Trace( " Pin %i", j ); for (KSDATARANGE_AUDIO const &range : pPin->m_dataRangesItem)
FOREACH_CONST( KSDATARANGE_AUDIO, pPin->m_dataRangesItem, range )
{ {
RString sSubFormat; RString sSubFormat;
if( !memcmp(&range->DataRange.SubFormat, &KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID)) ) GUID const &rawSubFormat = range.DataRange.SubFormat;
if( !memcmp(&rawSubFormat, &KSDATAFORMAT_SUBTYPE_WILDCARD, sizeof(GUID)) )
sSubFormat = "WILDCARD"; sSubFormat = "WILDCARD";
else if( !memcmp(&range->DataRange.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID)) ) else if( !memcmp(&rawSubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID)) )
sSubFormat = "PCM"; sSubFormat = "PCM";
else if( !memcmp(&range->DataRange.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID)) ) else if( !memcmp(&rawSubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID)) )
sSubFormat = "FLOAT"; sSubFormat = "FLOAT";
LOG->Trace( " Range: %i channels, sample %i-%i, %i-%ihz (%s)", LOG->Trace( " Range: %i channels, sample %i-%i, %i-%ihz (%s)",
range->MaximumChannels, range.MaximumChannels,
range->MinimumBitsPerSample, range.MinimumBitsPerSample,
range->MaximumBitsPerSample, range.MaximumBitsPerSample,
range->MinimumSampleFrequency, range.MinimumSampleFrequency,
range->MaximumSampleFrequency, range.MaximumSampleFrequency,
sSubFormat.c_str() sSubFormat.c_str()
); );
} }