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

Merge branches 'ehofman/propfix' and 'ehofman/sound'

Browse Source
This commit is contained in:
Tim Moore
2010-04-25 22:32:44 +02:00
parent 967d63dec4 64072be83c 229abb8412
commit 2e13877926
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/props/props.cxx
+14 -5
View File
@@ -94,7 +94,7 @@ public:
template<typename Range> template<typename Range>
inline Range inline Range
parse_name (const Range &path) parse_name (const SGPropertyNode *node, const Range &path)
{ {
typename Range::iterator i = path.begin(); typename Range::iterator i = path.begin();
typename Range::iterator max = path.end(); typename Range::iterator max = path.end();
@@ -118,15 +118,24 @@ parse_name (const Range &path)
} else if (*i == '[' || *i == '/') { } else if (*i == '[' || *i == '/') {
break; break;
} else { } else {
throw string("name may contain only ._- and alphanumeric characters"); string err = "'";
err.push_back(*i);
err.append("' found in propertyname after '"+node->getNameString()+"'");
err.append("\nname may contain only ._- and alphanumeric characters");
throw err;
} }
i++; i++;
} }
} }
else { else {
if (path.begin() == i) if (path.begin() == i) {
throw string("name must begin with alpha or '_'"); string err = "'";
err.push_back(*i);
err.append("' found in propertyname after '"+node->getNameString()+"'");
err.append("\nname must begin with alpha or '_'");
throw err;
}
} }
return Range(path.begin(), i); return Range(path.begin(), i);
} }
@@ -268,7 +277,7 @@ find_node_aux(SGPropertyNode * current, SplitItr& itr, bool create,
// Empty name at this point is empty, not root. // Empty name at this point is empty, not root.
if (token.empty()) if (token.empty())
return find_node_aux(current, ++itr, create, last_index); return find_node_aux(current, ++itr, create, last_index);
Range name = parse_name(token); Range name = parse_name(current, token);
if (equals(name, ".")) if (equals(name, "."))
return find_node_aux(current, ++itr, create, last_index); return find_node_aux(current, ++itr, create, last_index);
if (equals(name, "..")) { if (equals(name, "..")) {
simgear/sound/sample_group.cxx
+2 -2
View File
@@ -275,7 +275,7 @@ SGSampleGroup::stop ()
void void
SGSampleGroup::suspend () SGSampleGroup::suspend ()
{ {
if (_pause == false) { if (_active && _pause == false) {
_pause = true; _pause = true;
sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end(); sample_map_iterator sample_end = _samples.end();
@@ -294,7 +294,7 @@ SGSampleGroup::suspend ()
void void
SGSampleGroup::resume () SGSampleGroup::resume ()
{ {
if (_pause == true) { if (_active && _pause == true) {
sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end(); sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) { for ( ; sample_current != sample_end; ++sample_current ) {
simgear/sound/soundmgr_openal.cxx
+3 -2
View File
@@ -164,8 +164,9 @@ void SGSoundMgr::init(const char *devname) {
_vendor = (const char *)alGetString(AL_VENDOR); _vendor = (const char *)alGetString(AL_VENDOR);
_renderer = (const char *)alGetString(AL_RENDERER); _renderer = (const char *)alGetString(AL_RENDERER);
if ( (_vendor != "OpenAL Community" && _vendor != "Apple Computer Inc.") || if ( (_vendor != "Adalin" && _vendor != "Apple Computer Inc.") &&
(_renderer != "Software" && _renderer != "OpenAL Sample Implementation") (_vendor != "OpenAL Community" || (_renderer != "Software" &&
_renderer != "OpenAL Sample Implementation"))
) )
{ {
_bad_doppler = true; _bad_doppler = true;