X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fmain.cxx;h=8ac54aa5695984ea8d671a3e80b50954dad03b14;hb=571f7301f2b0b493f90769baa0728f82fa8ea731;hp=390aeb3b8693679db738e19be624e2eee7acd9a4;hpb=446b200edc9590ec1e0231e64084905f2bc8a5b9;p=flightgear.git diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 390aeb3b8..8ac54aa56 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -87,7 +88,6 @@ static double real_delta_time_sec = 0.0; double delta_time_sec = 0.0; -extern float init_volume; using namespace flightgear; @@ -105,6 +105,9 @@ long global_multi_loop; SGTimeStamp last_time_stamp; SGTimeStamp current_time_stamp; +void fgInitSoundManager(); +void fgSetNewSoundDevice(const char *); + // The atexit() function handler should know when the graphical subsystem // is initialized. extern int _bootstrap_OSInit; @@ -165,7 +168,7 @@ void fgUpdateTimeDepCalcs() { // normal playback replay_time->setDoubleValue( replay_time->getDoubleValue() + ( delta_time_sec - * fgGetInt("/sim/speed-up") ) ); + * fgGetInt("/sim/speed-up") ) ); } else if ( replay_state->getIntValue() == 2 ) { // paused playback (don't advance replay time) } @@ -342,14 +345,14 @@ static void fgMainLoop( void ) { // probably move eventually /* printf("Before - ground = %.2f runway = %.2f alt = %.2f\n", - scenery.get_cur_elev(), - cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER, - cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */ + scenery.get_cur_elev(), + cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER, + cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */ /* printf("Adjustment - ground = %.2f runway = %.2f alt = %.2f\n", - scenery.get_cur_elev(), - cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER, - cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */ + scenery.get_cur_elev(), + cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER, + cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */ // cout << "Warp = " << globals->get_warp() << endl; @@ -421,7 +424,7 @@ static void fgMainLoop( void ) { general.set_frame_rate( frames ); fgSetInt("/sim/frame-rate", frames); SG_LOG( SG_ALL, SG_DEBUG, - "--> Frame rate is = " << general.get_frame_rate() ); + "--> Frame rate is = " << general.get_frame_rate() ); frames = 0; } last_time = t->get_cur_time(); @@ -450,7 +453,7 @@ static void fgMainLoop( void ) { fgUpdateTimeDepCalcs(); } else { SG_LOG( SG_ALL, SG_DEBUG, - "Elapsed time is zero ... we're zinging" ); + "Elapsed time is zero ... we're zinging" ); } globals->get_subsystem_mgr()->update(delta_time_sec); @@ -461,8 +464,8 @@ static void fgMainLoop( void ) { // we may want to move this to its own class at some point // double visibility_meters = fgGetDouble("/environment/visibility-m"); - globals->get_tile_mgr()->prep_ssg_nodes( visibility_meters ); + // update tile manager for view... SGVec3d viewPos = globals->get_current_view()->get_view_pos(); SGGeod geodViewPos = SGGeod::fromCart(viewPos); @@ -478,13 +481,37 @@ static void fgMainLoop( void ) { // update the view angle as late as possible, but before sound calculations globals->get_viewmgr()->update(real_delta_time_sec); - //////////////////////////////////////////////////////////////////// // Update the sound manager last so it can use the CPU while the GPU // is processing the scenery (doubled the frame-rate for me) -EMH- - //////////////////////////////////////////////////////////////////// #ifdef ENABLE_AUDIO_SUPPORT - static SGSoundMgr *smgr = (SGSoundMgr *)globals->get_subsystem("soundmgr"); - smgr->update_late(delta_time_sec); + static bool smgr_init = true; + if (smgr_init == true) { + static SGPropertyNode *sound_working = fgGetNode("/sim/sound/working"); + if (sound_working->getBoolValue() == true) { + fgInitSoundManager(); + smgr_init = false; + } + } else { + static SGPropertyNode *sound_enabled = fgGetNode("/sim/sound/enabled"); + static SGSoundMgr *smgr = globals->get_soundmgr(); + static bool smgr_enabled = true; + + if (smgr_enabled != sound_enabled->getBoolValue()) { + if (smgr_enabled == true) { // request to suspend + smgr->suspend(); + smgr_enabled = false; + } else { + smgr->resume(); + smgr_enabled = true; + } + } + + if (smgr_enabled == true) { + static SGPropertyNode *volume = fgGetNode("/sim/sound/volume"); + smgr->set_volume(volume->getFloatValue()); + smgr->update(delta_time_sec); + } + } #endif // END Tile Manager udpates @@ -492,17 +519,41 @@ static void fgMainLoop( void ) { if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded() && cur_fdm_state->get_inited()) { fgSetBool("sim/sceneryloaded",true); - fgSetFloat("/sim/sound/volume", init_volume); -#ifdef ENABLE_AUDIO_SUPPORT - smgr->set_volume(init_volume); -#endif + if (fgGetBool("/sim/sound/working")) { + globals->get_soundmgr()->activate(); + } + globals->get_props()->tie("/sim/sound/devices/name", + SGRawValueFunctions(0, fgSetNewSoundDevice), false); } - + simgear::AtomicChangeListener::fireChangeListeners(); fgRequestRedraw(); SG_LOG( SG_ALL, SG_DEBUG, "" ); } +void fgInitSoundManager() +{ + SGSoundMgr *smgr = globals->get_soundmgr(); + + smgr->bind(); + smgr->init(fgGetString("/sim/sound/device-name", NULL)); + + vector devices = smgr->get_available_devices(); + for (unsigned int i=0; isetStringValue(devices[i]); + } + devices.clear(); +} + +void fgSetNewSoundDevice(const char *device) +{ + globals->get_soundmgr()->suspend(); + globals->get_soundmgr()->stop(); + globals->get_soundmgr()->init(device); + globals->get_soundmgr()->resume(); +} + // Operation for querying OpenGL parameters. This must be done in a // valid OpenGL context, potentially in another thread. namespace @@ -633,15 +684,6 @@ static void fgIdleFunction ( void ) { } else if ( idle_state == 5 ) { idle_state++; -#ifdef ENABLE_AUDIO_SUPPORT - //////////////////////////////////////////////////////////////////// - // Add the Sound Manager before any other subsystem that uses it. - // This makes sure the SoundMgr is available at construction time. - //////////////////////////////////////////////////////////////////// - init_volume = fgGetFloat("/sim/sound/volume"); - fgSetFloat("/sim/sound/volume", 0.0f); - globals->add_subsystem("soundmgr", new SGSoundMgr); -#endif //////////////////////////////////////////////////////////////////// // Initialize the 3D aircraft model subsystem (has a dependency on @@ -741,7 +783,7 @@ static void fgIdleFunction ( void ) { # if defined( __CYGWIN__ ) string command = "start /m `cygpath -w " + mp3file.str() + "`"; -# elif defined( WIN32 ) +# elif defined( _WIN32 ) string command = "start /m " + mp3file.str(); # else string command = "mpg123 " + mp3file.str() + "> /dev/null 2>&1"; @@ -776,7 +818,9 @@ static void fgIdleFunction ( void ) { fgGetInt("/sim/startup/ysize") ); fgSplashProgress("loading scenery objects"); - + int session = fgGetInt("/sim/session",0); + session++; + fgSetInt("/sim/session",session); } if ( idle_state == 1000 ) { @@ -847,7 +891,7 @@ bool fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "1.9.0"; + static char required_version[] = "2.0.0"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application