mirror of
https://github.com/love2d/love.git
synced 2026-08-16 08:11:02 +02:00
Microphone input implemented.
RecordingDevice class added (number)love.audio.getRecordingDeviceCount() and (table)love.audio.getRecordingDevices() exposed (bool):startRecording([samples, sampleRate, bitDepth, channels], (SoundData):stopRecording([SoundData]), (SoundData):getData([SoundData]), (number):getSampleCount(), (number):getSampleRate(), (number):getBitDepth(), (number):getChannels(), (string):getName(), (number):getID(), (bool):isRecording() member functions exposed previously existed stub implementation removed getFormat moved to love::audio::openal::Audio getFormat arguments order swapped to (bitDepth, channels) getFormat now returns AL_NONE if format is invalid --HG-- branch : minor-mic-input
This commit is contained in:
@@ -144,23 +144,19 @@ float Audio::getDopplerScale() const
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
void Audio::record()
|
||||
int Audio::getRecordingDeviceCount() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
love::sound::SoundData *Audio::getRecordedData()
|
||||
love::audio::RecordingDevice *Audio::getRecordingDevice(int index) const
|
||||
{
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
love::sound::SoundData *Audio::stopRecording(bool)
|
||||
int Audio::getRecordingDeviceIndex(love::audio::RecordingDevice *device) const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool Audio::canRecord()
|
||||
{
|
||||
return false;
|
||||
return -1;
|
||||
}
|
||||
|
||||
Audio::DistanceModel Audio::getDistanceModel() const
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
// LOVE
|
||||
#include "audio/Audio.h"
|
||||
|
||||
#include "RecordingDevice.h"
|
||||
#include "Source.h"
|
||||
|
||||
namespace love
|
||||
@@ -70,10 +71,9 @@ public:
|
||||
void setDopplerScale(float scale);
|
||||
float getDopplerScale() const;
|
||||
|
||||
void record();
|
||||
love::sound::SoundData *getRecordedData();
|
||||
love::sound::SoundData *stopRecording(bool returnData);
|
||||
bool canRecord();
|
||||
int getRecordingDeviceCount() const;
|
||||
love::audio::RecordingDevice *getRecordingDevice(int index) const;
|
||||
int getRecordingDeviceIndex(love::audio::RecordingDevice *device) const;
|
||||
|
||||
DistanceModel getDistanceModel() const;
|
||||
void setDistanceModel(DistanceModel distanceModel);
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2016 LOVE Development Team
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented = 0; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
* 3. This notice may not be removed or altered from any source distribution.
|
||||
**/
|
||||
|
||||
#include "RecordingDevice.h"
|
||||
#include "Audio.h"
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace audio
|
||||
{
|
||||
namespace null
|
||||
{
|
||||
|
||||
const char *RecordingDevice::name = "null";
|
||||
|
||||
RecordingDevice::RecordingDevice(const char *, int)
|
||||
{
|
||||
}
|
||||
|
||||
RecordingDevice::~RecordingDevice()
|
||||
{
|
||||
}
|
||||
|
||||
bool RecordingDevice::startRecording()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool RecordingDevice::startRecording(int, int, int, int)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void RecordingDevice::stopRecording()
|
||||
{
|
||||
}
|
||||
|
||||
int RecordingDevice::getData(love::sound::SoundData*)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int RecordingDevice::getSampleCount() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int RecordingDevice::getSampleRate() const
|
||||
{
|
||||
return 8000;
|
||||
}
|
||||
|
||||
int RecordingDevice::getBitDepth() const
|
||||
{
|
||||
return 16;
|
||||
}
|
||||
|
||||
int RecordingDevice::getChannels() const
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
const char *RecordingDevice::getName() const
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
int RecordingDevice::getID() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool RecordingDevice::isRecording() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
} //null
|
||||
} //audio
|
||||
} //love
|
||||
@@ -0,0 +1,59 @@
|
||||
/**
|
||||
* Copyright (c) 2006-2016 LOVE Development Team
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented = 0; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
* 3. This notice may not be removed or altered from any source distribution.
|
||||
**/
|
||||
|
||||
#ifndef LOVE_AUDIO_NULL_RECORDING_DEVICE_H
|
||||
#define LOVE_AUDIO_NULL_RECORDING_DEVICE_H
|
||||
|
||||
#include "audio/RecordingDevice.h"
|
||||
#include "sound/SoundData.h"
|
||||
|
||||
namespace love
|
||||
{
|
||||
namespace audio
|
||||
{
|
||||
namespace null
|
||||
{
|
||||
|
||||
class RecordingDevice : public love::audio::RecordingDevice
|
||||
{
|
||||
public:
|
||||
RecordingDevice(const char *name, int id);
|
||||
virtual ~RecordingDevice();
|
||||
virtual bool startRecording();
|
||||
virtual bool startRecording(int samples, int sampleRate, int bitDepth, int channels);
|
||||
virtual void stopRecording();
|
||||
virtual int getData(love::sound::SoundData *soundData);
|
||||
virtual const char *getName() const;
|
||||
virtual int getID() const;
|
||||
virtual int getSampleCount() const;
|
||||
virtual int getSampleRate() const;
|
||||
virtual int getBitDepth() const;
|
||||
virtual int getChannels() const;
|
||||
virtual bool isRecording() const;
|
||||
|
||||
private:
|
||||
static const char *name;
|
||||
}; //RecordingDevice
|
||||
|
||||
} //null
|
||||
} //audio
|
||||
} //love
|
||||
|
||||
#endif //LOVE_AUDIO_NULL_RECORDING_DEVICE_H
|
||||
Reference in New Issue
Block a user