wav working wersion

AudioBase.cpp

@@ -0,0 +1,187 @@
+/*
+ * SoundBase.cpp
+ *
+ *  Created on: Jun 2, 2016
+ *      Author: michal
+ */
+
+#include "AudioBase.h"
+
+namespace Audio {
+
+AudioBase::AudioBase(const char* _name) : name{_name}
+{
+
+}
+
+
+snd_pcm_hw_params_t* AudioBase::getParamStructure() const
+{
+	return hwParams;
+}
+
+
+snd_pcm_t* AudioBase::getDeviceStructure() const
+{
+	return soundDevice;
+}
+
+
+void AudioBase::abort(int err)
+{
+	log_write( "Error: ");
+	log_writeln(snd_strerror(err) );
+	throw std::string(snd_strerror(err));
+}
+
+
+void AudioBase::opendev(snd_pcm_stream_t stream, int mode)
+{
+	int err = snd_pcm_open(&soundDevice, name, stream, mode);
+	if(err < 0)
+		abort(err);
+
+	allocateDefault();
+}
+
+
+void AudioBase::allocateDefault()
+{
+	int err = snd_pcm_hw_params_malloc(&hwParams);
+	if(err < 0)
+		abort(err);
+
+	err = snd_pcm_hw_params_any(soundDevice, hwParams);
+	if(err < 0)
+		abort(err);
+}
+
+
+void AudioBase::setAccess(snd_pcm_access_t access)
+{
+	int err = snd_pcm_hw_params_set_access(soundDevice, hwParams, access);
+	if(err < 0)
+		abort(err);
+}
+
+
+void AudioBase::setFormat(snd_pcm_format_t format)
+{
+	int err = snd_pcm_hw_params_set_format(soundDevice, hwParams, format);
+	if(err < 0)
+		abort(err);
+}
+
+
+void AudioBase::setChannels(Channels channels)
+{
+	int err = snd_pcm_hw_params_set_channels(soundDevice, hwParams, static_cast<unsigned int>(channels));
+	if(err < 0)
+		abort(err);
+}
+
+
+void AudioBase::setRateNear(unsigned int val, int dir)
+{
+	int err = snd_pcm_hw_params_set_rate_near(soundDevice, hwParams, &val, &dir);
+	if(err < 0)
+		abort(err);
+}
+
+
+void AudioBase::setParams(snd_pcm_format_t format, snd_pcm_access_t access, Channels channels,
+		unsigned int rate, int soft_resample, unsigned int latency)
+{
+	int err = snd_pcm_set_params(getDeviceStructure(), format, access,
+				static_cast<unsigned int>(channels), rate, soft_resample, latency);
+	if(err < 0)
+		abort(err);
+}
+
+
+snd_pcm_sframes_t AudioBase::writeInterleaved(const void* buffer, snd_pcm_uframes_t size)
+{
+	int frames = snd_pcm_writei(getDeviceStructure(), buffer, size);
+
+	if(frames < 0)
+		recoverStream(frames, 0);
+
+	return frames;
+}
+
+
+snd_pcm_sframes_t AudioBase::writeNonInterleaved(void** buffer, snd_pcm_uframes_t size)
+{
+	return snd_pcm_writen(getDeviceStructure(), buffer, size);
+}
+
+
+void AudioBase::recoverStream(int err, int silent)
+{
+	int _err = snd_pcm_recover(getDeviceStructure(), err, silent);
+	if(_err < 0)
+		abort();
+}
+
+
+void AudioBase::stopPresentingFrames()
+{
+	int err = snd_pcm_drain(getDeviceStructure());
+	if(err < 0)
+		abort();
+}
+
+
+void AudioBase::start()
+{
+	int err = snd_pcm_hw_params(soundDevice, hwParams);
+	if(err < 0)
+		abort(err);
+}
+
+
+std::string AudioBase::getName() const
+{
+	return std::string{ snd_pcm_name(soundDevice) };
+}
+
+
+std::string AudioBase::getState() const
+{
+	return std::string{ snd_pcm_state_name(snd_pcm_state(soundDevice)) };
+}
+
+
+Channels AudioBase::getChannels() const
+{
+	unsigned int channels {};
+	snd_pcm_hw_params_get_channels(hwParams, &channels);
+	return static_cast<Channels>(channels);
+}
+
+
+unsigned int AudioBase::getRate() const
+{
+	unsigned int rate {};
+	snd_pcm_hw_params_get_rate(hwParams, &rate, 0);
+	return rate;
+}
+
+
+snd_pcm_access_t AudioBase::getAccess() const
+{
+	snd_pcm_access_t access;
+	snd_pcm_hw_params_get_access(hwParams, &access);
+	return access;
+}
+
+
+/*
+ *
+ */
+AudioBase::~AudioBase()
+{
+
+}
+
+} /* namespace Sound */

AudioBase.h

@@ -0,0 +1,163 @@
+/*
+ * SoundBase.h
+ *
+ *  Created on: Jun 2, 2016
+ *      Author: michal
+ */
+
+#ifndef AUDIOBASE_H_
+#define AUDIOBASE_H_
+
+#include <alsa/asoundlib.h>
+#include "Logger.h"
+#include <iostream>
+
+
+namespace Audio {
+
+enum class Channels : unsigned int
+{
+	mono = 1,
+	stereo = 2
+};
+
+/**
+ * \ Base class with all configurations methods
+ */
+class AudioBase
+{
+//	std::shared_ptr<snd_pcm_t *> soundDevice;
+//	std::shared_ptr<snd_pcm_hw_params_t *> hwParams;
+	snd_pcm_t* soundDevice { nullptr };
+	snd_pcm_hw_params_t* hwParams { nullptr };
+	const char* name { nullptr };
+
+public:
+
+	AudioBase(const char* _name);
+
+	snd_pcm_hw_params_t* getParamStructure() const;
+
+
+	snd_pcm_t* getDeviceStructure() const;
+
+
+	/**
+	 * \ Abort function, make extension if error code is existing
+	 */
+	void abort(int err = -1);
+
+	/**
+	 * \ Open device
+	 */
+	void opendev(snd_pcm_stream_t stream, int mode = 0);
+
+	/**
+	 * \ Allocate hardware param memory and set the default values
+	 */
+	void allocateDefault();
+
+	/**
+	 * \
+	 */
+	void setAccess(snd_pcm_access_t access);
+
+
+	/**
+	 * \
+	 */
+	void setFormat(snd_pcm_format_t format);
+
+
+	/**
+	 * \
+	 */
+	void setChannels(Channels channels);
+
+
+	/**
+	 * \
+	 */
+	void setRateNear(unsigned int val, int dir = 0);
+
+	/**
+	 * \
+	 */
+	void setParams(snd_pcm_format_t format, snd_pcm_access_t access, Channels channels,
+			unsigned int rate, int soft_resample, unsigned int latency);
+
+
+	/**
+	 * \
+	 */
+	snd_pcm_sframes_t writeInterleaved(const void* buffer, snd_pcm_uframes_t size);
+
+
+	/**
+	 * \
+	 */
+	snd_pcm_sframes_t writeNonInterleaved(void** buffer, snd_pcm_uframes_t size);
+
+
+	/**
+	 * \
+	 */
+	void recoverStream(int err, int silent);
+
+
+	/**
+	 * \
+	 */
+	void recoverStream(snd_pcm_t *pcm, int err, int silent);
+
+
+	/**
+	 * \
+	 */
+	void stopPresentingFrames();
+
+
+	/**
+	 * \ Write all parameters
+	 */
+	void start();
+
+
+	/**
+	 * \
+	 */
+	std::string getName() const;
+
+
+	/**
+	 * \
+	 */
+	std::string getState() const;
+
+
+	/**
+	 * \
+	 */
+	Channels getChannels() const;
+
+
+	/**
+	 * \
+	 */
+	unsigned int getRate() const;
+
+
+	/**
+	 * \
+	 */
+	snd_pcm_access_t getAccess() const;
+
+	/*
+	 *
+	 */
+	virtual ~AudioBase();
+};
+
+} /* namespace Sound */
+
+#endif /* AUDIOBASE_H_ */

Logger.cpp

@@ -0,0 +1,24 @@
+/*
+ * Logger.cpp
+ *
+ *  Created on: Jun 2, 2016
+ *      Author: michal
+ */
+
+
+#include "Logger.h"
+
+void log_write(std::string&& s)
+{
+	std::cout << s;
+}
+
+void log_write(const char* s)
+{
+	std::cout << s;
+}
+
+void log_writeln(std::string&& s)
+{
+	std::cout << s << std::endl;
+}

Logger.h

@@ -0,0 +1,20 @@
+/*
+ * Logger.h
+ *
+ *  Created on: Jun 2, 2016
+ *      Author: michal
+ */
+
+#ifndef LOGGER_H_
+#define LOGGER_H_
+
+#include <iostream>
+
+void log_write(std::string&& s);
+
+void log_write(const char* s);
+
+void log_writeln(std::string&& s);
+
+
+#endif /* LOGGER_H_ */