FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use more modern C++

Browse Source
This commit is contained in:
Erik Hofman 2020-03-20 10:40:09 +01:00
parent b458300c02
commit 75f40fad95
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/sound/xmlsound.cxx
View File

@ -55,7 +55,7 @@ static double _snd_log(double v) { return log(fabs(v)+1e-9); }
// static double _snd_pow3(double v) { return v*v*v; } // static double _snd_pow3(double v) { return v*v*v; }
SGXmlSound::SGXmlSound() SGXmlSound::SGXmlSound()
: _sample(NULL), : _sample(nullptr),
_active(false), _active(false),
_name(""), _name(""),
_mode(SGXmlSound::ONCE), _mode(SGXmlSound::ONCE),
@ -120,7 +120,7 @@ SGXmlSound::init( SGPropertyNode *root,
_property = root->getNode(propval, true); _property = root->getNode(propval, true);
SGPropertyNode *condition = node->getChild("condition"); SGPropertyNode *condition = node->getChild("condition");
if (condition != NULL) if (condition != nullptr)
_condition = sgReadCondition(root, condition); _condition = sgReadCondition(root, condition);
if (!_property && !_condition) if (!_property && !_condition)
@ -137,10 +137,10 @@ SGXmlSound::init( SGPropertyNode *root,
float v = 0.0; float v = 0.0;
std::vector<SGPropertyNode_ptr> kids = node->getChildren("volume"); std::vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) { for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
_snd_prop volume = {NULL, NULL, NULL, NULL, 1.0, 0.0, 0.0, 0.0, false}; _snd_prop volume = {nullptr, nullptr, nullptr, nullptr, 1.0, 0.0, 0.0, 0.0, false};
SGPropertyNode *n = kids[i]->getChild("expression"); SGPropertyNode *n = kids[i]->getChild("expression");
if (n != NULL) { if (n != nullptr) {
volume.expr = SGReadDoubleExpression(root, n->getChild(0)); volume.expr = SGReadDoubleExpression(root, n->getChild(0));
} }
@ -201,13 +201,13 @@ SGXmlSound::init( SGPropertyNode *root,
float p = 0.0; float p = 0.0;
kids = node->getChildren("pitch"); kids = node->getChildren("pitch");
for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) { for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
_snd_prop pitch = {NULL, NULL, NULL, NULL, 1.0, 1.0, 0.0, 0.0, false}; _snd_prop pitch = {nullptr, nullptr, nullptr, nullptr, 1.0, 1.0, 0.0, 0.0, false};
double randomness = kids[i]->getDoubleValue("random", 0.0); double randomness = kids[i]->getDoubleValue("random", 0.0);
randomness *= sg_random(); randomness *= sg_random();
SGPropertyNode *n = kids[i]->getChild("expression"); SGPropertyNode *n = kids[i]->getChild("expression");
if (n != NULL) { if (n != nullptr) {
pitch.expr = SGReadDoubleExpression(root, n->getChild(0)); pitch.expr = SGReadDoubleExpression(root, n->getChild(0));
} }
@ -265,7 +265,7 @@ SGXmlSound::init( SGPropertyNode *root,
SGVec3f offset_pos = SGVec3f::zeros(); SGVec3f offset_pos = SGVec3f::zeros();
SGPropertyNode_ptr prop = node->getChild("position"); SGPropertyNode_ptr prop = node->getChild("position");
SGPropertyNode_ptr pos_prop[3]; SGPropertyNode_ptr pos_prop[3];
if ( prop != NULL ) { if ( prop != nullptr ) {
offset_pos[0] = -prop->getDoubleValue("x", 0.0); offset_pos[0] = -prop->getDoubleValue("x", 0.0);
offset_pos[1] = -prop->getDoubleValue("y", 0.0); offset_pos[1] = -prop->getDoubleValue("y", 0.0);
offset_pos[2] = -prop->getDoubleValue("z", 0.0); offset_pos[2] = -prop->getDoubleValue("z", 0.0);
@ -295,7 +295,7 @@ SGXmlSound::init( SGPropertyNode *root,
float outer = 360.0; float outer = 360.0;
float outer_gain = 0.0; float outer_gain = 0.0;
prop = node->getChild("orientation"); prop = node->getChild("orientation");
if ( prop != NULL ) { if ( prop != nullptr ) {
dir = SGVec3f(-prop->getFloatValue("x", 0.0), dir = SGVec3f(-prop->getFloatValue("x", 0.0),
-prop->getFloatValue("y", 0.0), -prop->getFloatValue("y", 0.0),
-prop->getFloatValue("z", 0.0)); -prop->getFloatValue("z", 0.0));
@ -414,7 +414,7 @@ SGXmlSound::update (double dt)
double v = 1.0; double v = 1.0;
if (_volume[i].expr) { if (_volume[i].expr) {
v = _volume[i].expr->getValue(NULL); v = _volume[i].expr->getValue(nullptr);
expr = true; expr = true;
continue; continue;
} }
@ -462,7 +462,7 @@ SGXmlSound::update (double dt)
double p = 1.0; double p = 1.0;
if (_pitch[i].expr) { if (_pitch[i].expr) {
p = _pitch[i].expr->getValue(NULL); p = _pitch[i].expr->getValue(nullptr);
expr = true; expr = true;
continue; continue;
} }

9
simgear/sound/xmlsound.hxx
View File

@ -29,6 +29,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <string> #include <string>
#include <functional>
#include <simgear/compiler.h> #include <simgear/compiler.h>
@ -136,11 +137,11 @@ protected:
enum { ONCE=0, LOOPED, IN_TRANSIT }; enum { ONCE=0, LOOPED, IN_TRANSIT };
enum { LEVEL=0, INVERTED, FLIPFLOP }; enum { LEVEL=0, INVERTED, FLIPFLOP };
// SGXmlSound properties for using _fn_t = std::function<double(double)>;
typedef struct { typedef struct {
SGSharedPtr<SGExpressiond> expr; // sound system version 2.0 SGSharedPtr<SGExpressiond> expr; // sound system version 2.0
SGPropertyNode_ptr prop; SGPropertyNode_ptr prop;
double (*fn)(double); _fn_t fn;
double *intern; double *intern;
double factor; double factor;
double offset; double offset;
@ -149,9 +150,7 @@ protected:
bool subtract; bool subtract;
} _snd_prop; } _snd_prop;
protected: using _sound_fn_t = std::map <std::string, _fn_t>;
typedef double (*_fn_t)(double);
typedef std::map <std::string, _fn_t> _sound_fn_t;
_sound_fn_t _sound_fn; _sound_fn_t _sound_fn;
private: private: