1
0
Fork 0
Commit graph

161 commits

Author SHA1 Message Date
James Turner
8330449c5f Pass current-dir into XMLSound
(and update to revised SGSoundSample ctor)
2010-09-06 09:28:28 +01:00
Frederic Bouvier
461b5fe00b Compile with MSVC10 2010-08-01 18:07:18 +02:00
James Turner
ab495d1370 Add --fg-aircraft option, and aircraft dir path list. Partial support in places that load files, for respecting the setting.
Add helper to look for an aircraft branch path in multiple candidate locations.
Update the main subsystems to use the helper, and hence load from any aircraft dir.
2010-07-28 22:03:10 +01:00
James Turner
d1852430bf Make various implicit includes (via PLIB) explicit. 2010-07-28 10:25:42 +01:00
torsten
f14fc6b98f wrong logic never found the 'end' 2010-01-03 22:43:40 +01:00
ehofman
641f000860 Activate external-view checkbox for avionics 2009-12-09 08:16:48 +01:00
ehofman
c7ef67df80 add avionics enable/disable and volume control to the sound fx class. 2009-12-03 06:43:40 +01:00
ehofman
fde1a925fe Change of thoughts since it makes life easier:
/sim/sound/working		enable/disable the use of OpenAL
/sin/sound/enabled		master mute/unmute
2009-11-30 22:45:23 +01:00
ehofman
3a4892cede New Property layout:
/sim/sound/enabled		enable/disable the use of OpenAL
/sin/sound/pause		master mute, effects all SampleGroups
/sim/sound/volume		master volume
/sim/sound/effects/enabled	enable/disable (mute) sound fx
/sim/sound/effects/volume	effects volume
/sim/sound/chatter/enabled	enable/disable (mute) atc chatter
/sim/sound/chatter/volume	chatter (sample queue) volume
2009-11-29 15:57:37 +01:00
ehofman
3d19352f13 proper listener velocity calculation, this has no effect yet but is required when other models start emitting sounds. 2009-11-24 14:22:54 +01:00
ehofman
934ce52a23 Tie samplegroup 'avionics' to the listener, just in case no other device is created that does it. 2009-11-19 23:09:49 +01:00
ehofman
2bc7dc685b allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'. 2009-11-10 06:55:46 +01:00
ehofman
430fbe99fa Use shared pointers for any reference to SGSoundSample 2009-10-24 19:52:09 +02:00
ehofman
f9445874a0 Don't make the SoundManager a memebr of the subsystem manager; It needs to be initialized very early and destroyed as late as possible. That doesn't work as a subsystem meber onless some sort of priority scheme gets implemented. Get rid of auto_ptr which doesn work for the samples either. 2009-10-24 19:51:39 +02:00
ehofman
6e2974ea57 Assorted small soundsystem related fixes. 2009-10-21 16:27:45 +02:00
ehofman
e2678830ba Use auto_ptr when calling SGSoundSample 2009-10-20 00:00:08 +02:00
ehofman
7d6631d9a6 remove a debugging left-over 2009-10-20 00:00:08 +02:00
ehofman
b25940e1ea Fix a number of small bugs; eg test if SoundMgr::load fails and return false in that case. 2009-10-20 00:00:08 +02:00
ehofman
1b08051597 SoundManager fixes 2009-10-17 14:02:46 +02:00
ehofman
b582c118bd Correct (and verrified) position, orientation and velocity vector. Todo: proper sound orientation (the all face forward using the airplane orientation now) and disabling doppler effect when tied to the listener 2009-10-12 07:58:11 +02:00
ehofman
33e816abb9 Split up FGFX into a dedicated effects class (FGFX) and a sample queue class. Register the sample queue cass as 'queue' at the SoundManager and tie it to the listener position. 2009-10-08 10:38:10 +02:00
ehofman
86f462933d Initial commit of the new sound system, expect more updates to follow 2009-10-06 10:22:09 +02:00
jmt
0dbf2de0b6 Remove audio update from main.cxx, back to FGFX (but keep the timing-dependent piece done artificially late) 2009-09-20 00:20:17 +02:00
jmt
3c84e07a25 FGFX clean-ups, conversion of one more sgVec user. 2009-09-19 12:10:17 +02:00
daveluff
08dfa30d87 Fix MSVC compilation 2009-09-09 08:56:32 +02:00
jmt
049e1ae23e Fix compilation - missing include of globals.hxx 2009-09-09 08:56:32 +02:00
ehofman
e8db3a514a Dont execute code in case the soundmanager isn't properly initialized 2009-09-09 08:56:32 +02:00
frohlich
8676c2bbd8 Replace the SGVec*::sg() methods with the equivalent SGVec*::data() calls.
Modified Files:
	src/Traffic/Schedule.cxx src/Sound/fg_fx.cxx src/Main/main.cxx
	src/Instrumentation/navradio.cxx
	src/AIModel/AIFlightPlanCreateCruise.cxx
2009-09-09 08:56:30 +02:00
jmt
e1583cb28c Update FGViewer position clients to work with SGGeod directly 2009-06-11 16:05:20 +02:00
mfranz
095c710c0e leak fixes 2009-05-18 12:24:16 +02:00
frohlich
f14b69f9e6 Use the position from the model placement.
Modified Files:
	src/Sound/fg_fx.cxx
2009-03-11 23:14:33 +01:00
fredb
0dd1c66f95 Really catch sound exceptions, and avoid exiting on this kind of error :
OpenAL error (AL_INVALID_VALUE): constructor (alBufferData)
Failed to buffer data.
2008-12-12 07:35:39 +00:00
ehofman
88b2ae1471 Don't update twice.. 2008-09-05 11:48:08 +00:00
ehofman
a6f885b1fb Move the soundmanager update code back to the main loop, just prior to updating all the SGSubsystems. Hopefuly this silves the sound problem. 2008-09-05 09:18:33 +00:00
ehofman
8d5de1659c fix a last minute typo 2008-08-22 09:57:49 +00:00
ehofman
8bb5bf7c46 Nothing fancy, it all seemed to work properly already... 2008-08-22 09:50:22 +00:00
ehofman
da96156c30 Move SGSoundMgr stuff oevr to FGFX 2008-08-21 14:26:27 +00:00
ehofman
667e64e1eb - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
- this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x
2008-07-27 16:25:13 +00:00
ehofman
eccddb3dfd Attached patches remove BORLANDC, and hence SG_MATH_EXCEPTION_CLASH and SG_INCOM
PLETE_FUNCTIONAL from SimGear and FlightGear.

As a result, SG_HAVE_STD_INCLUDES is now *always* set, so I will get the boring
fixes for that done, but separately. I'm still auditing the other things in comp
ilers.h - there's a lot that can die now BORLAND is gone.
2008-07-25 10:39:53 +00:00
timoore
a9319336ba From Benoit Laniel: replace SG threading constructs with OpenThreads 2008-06-12 08:24:39 +00:00
timoore
fde0f8eb3c segfault in fg_fx.cxx fix
Check for null fx node, submitted by Tiago Gusmão.
2008-01-17 08:28:43 +00:00
curt
c8986567ae Syd Adams:
Patch to enable atc chatter (and any other arbitrary "message" audio file)
to be played at any specified volume.  (Previously these messages were always
played at a hardcoded volume of 1.0)
2007-04-20 18:32:42 +00:00
mfranz
caa83238b8 fix spectacularly useless error messages 2007-03-29 21:26:33 +00:00
mfranz
60516c8a3f If text contains "{display|voice}" groups, skip the delimiters and
discard the display part. The curly braces wouldn't be spoken anyway,
and the | would be spoken as "vertical bar", which is completely
useless (which is why it had been disabled in the past already).
2007-03-23 15:53:58 +00:00
mfranz
2e9cf978b7 - turn \n, \t, \r into spaces. Otherwise Festival spells out ".^M" as
"period".
- fix rather embarrassing string concatenation bug  :-)
2007-03-23 10:45:11 +00:00
mfranz
e48967cb1d fix another crash on exit by finally converting the rest of unguarded
SGPropertyNode to guarded ones. This is also done for JSBSim/JSBSim.hxx,
for which JSB had given explicit permission a while ago. I postponed that
back then, but now is the time.
2006-06-11 10:21:10 +00:00
frohlich
573fb5a50a Pigeons remaining 'crash on no sound device' fix. 2006-04-25 18:48:59 +00:00
frohlich
1aa1288620 Revert a part of the past patch. It still does not crash
but you can hear again the 737 ...
2006-04-23 18:44:22 +00:00
frohlich
aecfc1a229 Pigeon:
Avoid crashes if there is no sound device.
2006-04-23 15:29:39 +00:00
mfranz
c5c5411d07 - reduce timeout
- stop trying to connect after first failed attempt
2006-03-31 10:12:00 +00:00