Adding audiodevice object to list in the daemon

src/audio/Makefile.am

@@ -21,7 +21,7 @@ SAMPLERATE_LIB=
 endif
 
 libaudio_la_SOURCES = alaw.cpp        audiofile.cpp	g711.cpp tonelist.cpp     \
-audiortp.cpp         dtmf.cpp   tone.cpp audiocodec.cpp  audiolayer.cpp  dtmfgenerator.cpp  gsmcodec.cpp \
+audiortp.cpp         dtmf.cpp   tone.cpp audiocodec.cpp  audiolayer.cpp audiodevice.cpp  dtmfgenerator.cpp  gsmcodec.cpp \
 tonegenerator.cpp  ulaw.cpp codecDescriptor.cpp \
 audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES)
 
@@ -31,7 +31,7 @@ libaudio_la_CPPFLAGS = $(SPEEX_FLAG) $(SAMPLERATE_FLAG)
 
 
 noinst_HEADERS = audioloop.h       common.h ringbuffer.h alaw.h          audiofile.h g711.h \
- tonelist.h         audiortp.h audiocodec.h    audiolayer.h \
+ tonelist.h         audiortp.h audiocodec.h    audiolayer.h audiodevice.h \
  dtmfgenerator.h    gsmcodec.h      tonegenerator.h    ulaw.h \
  codecDescriptor.h    dtmf.h tone.h \
  CodecSpeex.h

src/audio/audiodevice.cpp

+/*
+ *  Copyright (C) 2006 Savoir-Faire Linux inc.
+ *  Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiodevice.h"
+#include "../global.h"
+
+const double AudioDevice::DEFAULT_RATE = 8000.0;
+
+AudioDevice::AudioDevice(int id, const std::string& apiName, const std::string& name) : 
+  _id(id), _apiName(apiName), _name(name)
+{
+  _rate = DEFAULT_RATE;
+}
+
+AudioDevice::~AudioDevice() 
+{
+}
+

src/audio/audiodevice.h

+/*
+ *  Copyright (C) 2006 Savoir-Faire Linux inc.
+ *  Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *                                                                              
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *                                                                              
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _AUDIO_DEVICE_H
+#define _AUDIO_DEVICE_H
+
+
+#include <string>
+
+#define AUDIODEVICERATE 8000
+
+/**
+ * Container device for attribute storage
+ * Have almost only get/set method
+ */
+class AudioDevice {
+public:
+  AudioDevice(int id, const std::string& apiName, const std::string& name);
+  ~AudioDevice();
+
+  const static double DEFAULT_RATE;
+
+  int getId() { return _id; }
+  const std::string& getApiName() {return _apiName; }
+  const std::string& getName() {return _name; }
+
+  void setRate(double rate) { _rate = rate;}
+  double getRate() { return _rate; }
+
+private:
+
+  /** Integer id of the device, can not be 0 */
+  int _id;
+  /** Host API Name, ex: OSS, ALSA */
+  std::string _apiName;
+  /** Name of the device */
+  std::string _name;
+  
+  /** Default rate in Hz, like 8000.0, default is AudioDevice::DEFAULT_RATE */
+  double _rate;
+};
+
+#endif // _AUDIO_DEVICE_H_
+