From 044665922f09d109c83f057afcb98e04ff83d262 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Tue, 28 Feb 2012 01:00:55 -0500
Subject: [PATCH] * #8968: alsalayer: use preincrement for iterators
---
daemon/src/audio/alsa/alsalayer.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/daemon/src/audio/alsa/alsalayer.cpp b/daemon/src/audio/alsa/alsalayer.cpp
index 29cf9a088c..2d0054aab0 100644
--- a/daemon/src/audio/alsa/alsalayer.cpp
+++ b/daemon/src/audio/alsa/alsalayer.cpp
@@ -436,14 +436,12 @@ AlsaLayer::buildDeviceTopo(const std::string &plugin, int card)
std::vector<std::string>
AlsaLayer::getAudioDeviceList(AudioStreamDirection dir) const
{
- std::vector<HwIDPair> deviceMap;
- std::vector<std::string> audioDeviceList;
-
- deviceMap = getAudioDeviceIndexMap(dir);
+ std::vector<HwIDPair> deviceMap(getAudioDeviceIndexMap(dir));
- for(std::vector<HwIDPair>::const_iterator iter = deviceMap.begin(); iter != deviceMap.end(); iter++) {
+ std::vector<std::string> audioDeviceList;
+ for (std::vector<HwIDPair>::const_iterator iter = deviceMap.begin();
+ iter != deviceMap.end(); ++iter)
audioDeviceList.push_back(iter->second);
- }
return audioDeviceList;
}
--
GitLab