Changeset 1295
- Timestamp:
- 07/13/08 15:28:16 (13 years ago)
- Files:
-
- branches/libffado-2.0/src/libcontrol/ClockSelect.cpp (modified) (4 diffs)
- branches/libffado-2.0/src/libcontrol/Element.cpp (modified) (2 diffs)
- branches/libffado-2.0/src/libcontrol/Element.h (modified) (3 diffs)
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; branches/libffado-2.0/src/libcontrol/Element.cpp
r1292 r1295 158 158 } 159 159 160 bool 161 Element::emitSignal(int id) 162 { 163 for ( std::vector< SignalFunctor* >::iterator it = m_signalHandlers.begin(); 164 it != m_signalHandlers.end(); 165 ++it ) 166 { 167 SignalFunctor *f = *it; 168 if(f && f->m_id == id) (*f)(); 169 } 170 return true; 171 } 172 160 173 //// --- Container --- //// 161 174 Container::Container(Element *p) … … 166 179 Container::Container(Element *p, std::string n) 167 180 : Element(p, n) 181 { 182 } 183 184 Container::~Container() 168 185 { 169 186 } branches/libffado-2.0/src/libcontrol/Element.h
r1201 r1295 50 50 virtual ~SignalFunctor() {} 51 51 52 virtual void operator() (int arg) = 0; 52 virtual void operator() () = 0; 53 virtual void operator() (int) = 0; 53 54 protected: 54 55 int m_id; … … 103 104 protected: 104 105 bool emitSignal(int id, int value); 106 bool emitSignal(int id); 105 107 Util::Mutex& getLock(); 106 108 … … 138 140 Container(Element *); 139 141 Container(Element *, std::string n); 140 virtual ~Container() {};141 142 virtual ~Container(); 143 142 144 virtual bool addElement(Element *e); 143 145 virtual bool deleteElement(Element *e);