Changeset 1295 for branches/libffado-2.0/src/libcontrol/ClockSelect.cpp
- Timestamp:
- 07/13/08 15:28:16 (16 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/src/libcontrol/ClockSelect.cpp
r1288 r1295 44 44 if(idx >= (int)v.size()) { 45 45 debugError("index out of range\n"); 46 return false; 47 } 48 if(idx < 0) { 49 debugError("index < 0\n"); 46 50 return false; 47 51 } … … 84 88 if(idx >= (int)v.size()) { 85 89 debugError("index out of range\n"); 86 return false; 90 return "Error"; 91 } 92 if(idx < 0) { 93 debugError("index < 0\n"); 94 return "Error"; 87 95 } 88 96 return v.at(idx).description; … … 185 193 { 186 194 std::vector<int> freqs = m_Device.getSupportedSamplingFrequencies(); 187 if (idx < (int)freqs.size()) {195 if (idx >= 0 && idx < (int)freqs.size()) { 188 196 if(!m_Device.setSamplingFrequency(freqs.at(idx))) { 189 197 debugWarning("Could not select samplerate\n"); … … 221 229 { 222 230 char tmp[16]; 223 std::string retval = " bad attr index";231 std::string retval = "Error"; 224 232 std::vector<int> freqs = m_Device.getSupportedSamplingFrequencies(); 225 if (idx < (int)freqs.size()) {233 if (idx >= 0 && idx < (int)freqs.size()) { 226 234 snprintf(tmp, 16, "%u", freqs.at(idx)); 227 235 retval = tmp;