Merge branch 'next' into attenuation
This commit is contained in:
commit
69b73a0233
5 changed files with 54 additions and 95 deletions
|
@ -147,7 +147,10 @@ FGAIBase::~FGAIBase() {
|
||||||
|
|
||||||
if (_refID != 0 && _refID != 1) {
|
if (_refID != 0 && _refID != 1) {
|
||||||
SGSoundMgr *smgr = globals->get_soundmgr();
|
SGSoundMgr *smgr = globals->get_soundmgr();
|
||||||
smgr->remove("aifx:"+_refID);
|
stringstream name;
|
||||||
|
name << "aifx:";
|
||||||
|
name << _refID;
|
||||||
|
smgr->remove(name.str());
|
||||||
}
|
}
|
||||||
|
|
||||||
delete fp;
|
delete fp;
|
||||||
|
@ -221,7 +224,8 @@ void FGAIBase::update(double dt) {
|
||||||
_fx->set_orientation( orient );
|
_fx->set_orientation( orient );
|
||||||
|
|
||||||
SGVec3d velocity;
|
SGVec3d velocity;
|
||||||
velocity = SGVec3d( speed_north_deg_sec, speed_east_deg_sec, pitch*speed );
|
velocity = SGVec3d( speed_north_deg_sec, speed_east_deg_sec,
|
||||||
|
pitch*speed );
|
||||||
_fx->set_velocity( velocity );
|
_fx->set_velocity( velocity );
|
||||||
}
|
}
|
||||||
else if (_aimodel)
|
else if (_aimodel)
|
||||||
|
@ -234,7 +238,10 @@ void FGAIBase::update(double dt) {
|
||||||
|
|
||||||
// initialize the sound configuration
|
// initialize the sound configuration
|
||||||
SGSoundMgr *smgr = globals->get_soundmgr();
|
SGSoundMgr *smgr = globals->get_soundmgr();
|
||||||
_fx = new FGFX(smgr, "aifx:"+_refID, props);
|
stringstream name;
|
||||||
|
name << "aifx:";
|
||||||
|
name << _refID;
|
||||||
|
_fx = new FGFX(smgr, name.str(), props);
|
||||||
_fx->init();
|
_fx->init();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,15 +25,11 @@
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <poll.h>
|
|
||||||
#include <linux/input.h>
|
|
||||||
#include <dbus/dbus.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include "FGLinuxEventInput.hxx"
|
#include "FGLinuxEventInput.hxx"
|
||||||
|
|
||||||
|
#include <libudev.h>
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <dbus/dbus.h>
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -445,92 +441,42 @@ void FGLinuxInputDevice::SetDevname( std::string name )
|
||||||
this->devname = name;
|
this->devname = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
FGLinuxEventInput::FGLinuxEventInput() :
|
FGLinuxEventInput::FGLinuxEventInput()
|
||||||
halcontext(NULL)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
FGLinuxEventInput::~FGLinuxEventInput()
|
FGLinuxEventInput::~FGLinuxEventInput()
|
||||||
{
|
{
|
||||||
if( halcontext != NULL ) {
|
|
||||||
libhal_ctx_shutdown( halcontext, NULL);
|
|
||||||
libhal_ctx_free( halcontext );
|
|
||||||
halcontext = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
//TODO: enable hotplug support
|
|
||||||
static void DeviceAddedCallback (LibHalContext *ctx, const char *udi)
|
|
||||||
{
|
|
||||||
FGLinuxEventInput * linuxEventInput = (FGLinuxEventInput*)libhal_ctx_get_user_data (ctx);
|
|
||||||
linuxEventInput->AddHalDevice( udi );
|
|
||||||
}
|
|
||||||
|
|
||||||
static void DeviceRemovedCallback (LibHalContext *ctx, const char *udi)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void FGLinuxEventInput::postinit()
|
void FGLinuxEventInput::postinit()
|
||||||
{
|
{
|
||||||
FGEventInput::postinit();
|
FGEventInput::postinit();
|
||||||
|
|
||||||
DBusConnection * connection;
|
struct udev * udev = udev_new();
|
||||||
DBusError dbus_error;
|
|
||||||
|
|
||||||
dbus_error_init(&dbus_error);
|
struct udev_enumerate *enumerate = udev_enumerate_new(udev);
|
||||||
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
|
udev_enumerate_add_match_subsystem(enumerate, "input");
|
||||||
if (dbus_error_is_set(&dbus_error)) {
|
udev_enumerate_scan_devices(enumerate);
|
||||||
SG_LOG( SG_INPUT, SG_ALERT, "Can't connect to system bus " << dbus_error.message);
|
struct udev_list_entry *devices = udev_enumerate_get_list_entry(enumerate);
|
||||||
dbus_error_free (&dbus_error);
|
struct udev_list_entry *dev_list_entry;
|
||||||
return;
|
|
||||||
|
udev_list_entry_foreach(dev_list_entry, devices) {
|
||||||
|
const char * path = udev_list_entry_get_name(dev_list_entry);
|
||||||
|
struct udev_device *dev = udev_device_new_from_syspath(udev, path);
|
||||||
|
const char * node = udev_device_get_devnode(dev);
|
||||||
|
|
||||||
|
dev = udev_device_get_parent( dev );
|
||||||
|
const char * name = udev_device_get_sysattr_value(dev,"name");
|
||||||
|
|
||||||
|
SG_LOG(SG_INPUT,SG_ALERT, "name=" << (name?name:"<null>") << ", node=" << (node?node:"<null>"));
|
||||||
|
if( name && node )
|
||||||
|
AddDevice( new FGLinuxInputDevice(name, node) );
|
||||||
|
|
||||||
|
udev_device_unref(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
halcontext = libhal_ctx_new();
|
udev_unref(udev);
|
||||||
|
|
||||||
libhal_ctx_set_dbus_connection (halcontext, connection );
|
|
||||||
dbus_error_init (&dbus_error);
|
|
||||||
|
|
||||||
if( libhal_ctx_init( halcontext, &dbus_error )) {
|
|
||||||
|
|
||||||
int num_devices = 0;
|
|
||||||
char ** devices = libhal_find_device_by_capability(halcontext, "input", &num_devices, NULL);
|
|
||||||
|
|
||||||
for ( int i = 0; i < num_devices; i++)
|
|
||||||
AddHalDevice( devices[i] );
|
|
||||||
|
|
||||||
libhal_free_string_array (devices);
|
|
||||||
|
|
||||||
//TODO: enable hotplug support
|
|
||||||
// libhal_ctx_set_user_data( halcontext, this );
|
|
||||||
// libhal_ctx_set_device_added( halcontext, DeviceAddedCallback );
|
|
||||||
// libhal_ctx_set_device_removed( halcontext, DeviceRemovedCallback );
|
|
||||||
} else {
|
|
||||||
if(dbus_error_is_set (&dbus_error) ) {
|
|
||||||
SG_LOG( SG_INPUT, SG_ALERT, "Can't connect to hald: " << dbus_error.message);
|
|
||||||
dbus_error_free (&dbus_error);
|
|
||||||
} else {
|
|
||||||
SG_LOG( SG_INPUT, SG_ALERT, "Can't connect to hald." );
|
|
||||||
}
|
|
||||||
|
|
||||||
libhal_ctx_free (halcontext);
|
|
||||||
halcontext = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void FGLinuxEventInput::AddHalDevice( const char * udi )
|
|
||||||
{
|
|
||||||
char * device = libhal_device_get_property_string( halcontext, udi, "input.device", NULL);
|
|
||||||
char * product = libhal_device_get_property_string( halcontext, udi, "input.product", NULL);
|
|
||||||
|
|
||||||
if( product != NULL && device != NULL )
|
|
||||||
AddDevice( new FGLinuxInputDevice(product, device) );
|
|
||||||
else
|
|
||||||
SG_LOG( SG_INPUT, SG_ALERT, "Can't get device or product property of " << udi );
|
|
||||||
|
|
||||||
if( device != NULL ) libhal_free_string( device );
|
|
||||||
if( product != NULL ) libhal_free_string( product );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
|
|
||||||
#include "FGEventInput.hxx"
|
#include "FGEventInput.hxx"
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <hal/libhal.h>
|
|
||||||
|
|
||||||
struct FGLinuxEventData : public FGEventData {
|
struct FGLinuxEventData : public FGEventData {
|
||||||
FGLinuxEventData( struct input_event & event, double dt, int modifiers ) :
|
FGLinuxEventData( struct input_event & event, double dt, int modifiers ) :
|
||||||
|
@ -71,10 +70,7 @@ public:
|
||||||
virtual void update (double dt);
|
virtual void update (double dt);
|
||||||
virtual void postinit();
|
virtual void postinit();
|
||||||
|
|
||||||
void AddHalDevice( const char * udi );
|
|
||||||
protected:
|
protected:
|
||||||
LibHalContext *halcontext;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -40,11 +40,21 @@
|
||||||
#include <simgear/sound/xmlsound.hxx>
|
#include <simgear/sound/xmlsound.hxx>
|
||||||
|
|
||||||
FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
|
FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
|
||||||
_props( props ),
|
_props( props )
|
||||||
_enabled( fgGetNode("/sim/sound/effects/enabled", true) ),
|
|
||||||
_volume( fgGetNode("/sim/sound/effects/volume", true) )
|
|
||||||
{
|
{
|
||||||
if (!props) _props = globals->get_props();
|
if (!props) {
|
||||||
|
_is_aimodel = false;
|
||||||
|
_props = globals->get_props();
|
||||||
|
_enabled = fgGetNode("/sim/sound/effects/enabled", true);
|
||||||
|
_volume = fgGetNode("/sim/sound/effects/volume", true);
|
||||||
|
} else {
|
||||||
|
_is_aimodel = true;
|
||||||
|
_enabled = _props->getNode("/sim/sound/aimodels/enabled", true);
|
||||||
|
_enabled->setBoolValue(fgGetBool("/sim/sound/effects/enabled"));
|
||||||
|
_volume = _props->getNode("/sim/sound/aimodels/volume", true);
|
||||||
|
_volume->setFloatValue(fgGetFloat("/sim/sound/effects/volume"));
|
||||||
|
_volume->setFloatValue(0.1f);
|
||||||
|
}
|
||||||
|
|
||||||
_avionics_enabled = _props->getNode("sim/sound/avionics/enabled", true);
|
_avionics_enabled = _props->getNode("sim/sound/avionics/enabled", true);
|
||||||
_avionics_volume = _props->getNode("sim/sound/avionics/volume", true);
|
_avionics_volume = _props->getNode("sim/sound/avionics/volume", true);
|
||||||
|
@ -97,18 +107,17 @@ FGFX::init()
|
||||||
}
|
}
|
||||||
|
|
||||||
node = root.getNode("fx");
|
node = root.getNode("fx");
|
||||||
if(node) {
|
if(node && !_is_aimodel) {
|
||||||
for (int i = 0; i < node->nChildren(); ++i) {
|
for (int i = 0; i < node->nChildren(); ++i) {
|
||||||
SGXmlSound *sound = new SGXmlSound();
|
SGXmlSound *soundfx = new SGXmlSound();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
sound->init(globals->get_props(), node->getChild(i), this,
|
soundfx->init( _props, node->getChild(i), this, _avionics,
|
||||||
_avionics, path.dir());
|
path.dir() );
|
||||||
|
_sound.push_back( soundfx );
|
||||||
_sound.push_back(sound);
|
|
||||||
} catch ( sg_exception &e ) {
|
} catch ( sg_exception &e ) {
|
||||||
SG_LOG(SG_SOUND, SG_ALERT, e.getFormattedMessage());
|
SG_LOG(SG_SOUND, SG_ALERT, e.getFormattedMessage());
|
||||||
delete sound;
|
delete soundfx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
bool _is_aimodel;
|
||||||
SGSharedPtr<SGSampleGroup> _avionics;
|
SGSharedPtr<SGSampleGroup> _avionics;
|
||||||
std::vector<SGXmlSound *> _sound;
|
std::vector<SGXmlSound *> _sound;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue