eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

Merge pull request #72 from Unofficial-MaSzyna-Developement/separate-shp-buzzer

Browse Source 
Possibility to add separate SHP buzzer
This commit is contained in:
Ryba04
2025-01-03 18:46:14 +01:00
committed by GitHub
parent a996cd147b 1c8d0142a3
commit f3f59661c9
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Train.cpp
View File

@@ -8380,6 +8380,21 @@ TTrain::update_sounds( double const Deltatime ) {
// power-reliant sounds // power-reliant sounds
if( mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable ) { if( mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable ) {
// buzzer shp
if (mvOccupied->SecuritySystem.is_cabsignal_beeping()) {
if (dsbBuzzerShp && false == dsbBuzzerShp->is_playing()) {
dsbBuzzerShp->pitch(dsbBuzzerShp->m_frequencyoffset + dsbBuzzerShp->m_frequencyfactor);
dsbBuzzerShp->gain(dsbBuzzerShp->m_amplitudeoffset + dsbBuzzerShp->m_amplitudefactor);
dsbBuzzerShp->play(sound_flags::looping);
}
}
else {
if (dsbBuzzerShp && true == dsbBuzzerShp->is_playing()) {
dsbBuzzerShp->stop();
}
}
// McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa
// hunter-091012: rozdzielenie alarmow // hunter-091012: rozdzielenie alarmow
if( mvOccupied->SecuritySystem.is_beeping() ) { if( mvOccupied->SecuritySystem.is_beeping() ) {
@@ -8426,6 +8441,13 @@ TTrain::update_sounds( double const Deltatime ) {
#endif #endif
} }
} }
if (dsbBuzzerShp && dsbBuzzerShp->is_playing()) {
dsbBuzzerShp->stop();
}
{
}
if( m_distancecounterclear ) { if( m_distancecounterclear ) {
m_distancecounterclear->stop(); m_distancecounterclear->stop();
} }
@@ -8596,6 +8618,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName)
{"ctrlscnd:", {dsbNastawnikBocz, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"ctrlscnd:", {dsbNastawnikBocz, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"reverserkey:", {dsbReverserKey, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"reverserkey:", {dsbReverserKey, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"buzzer:", {dsbBuzzer, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"buzzer:", {dsbBuzzer, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"buzzershp:", {dsbBuzzerShp, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"radiostop:", {m_radiostop, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"radiostop:", {m_radiostop, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"slipalarm:", {dsbSlipAlarm, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"slipalarm:", {dsbSlipAlarm, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
{"distancecounter:", {m_distancecounterclear, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, {"distancecounter:", {m_distancecounterclear, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}},
@@ -8688,7 +8711,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName)
dsbSwitch, dsbPneumaticSwitch, dsbSwitch, dsbPneumaticSwitch,
rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU, rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU,
rsFadeSound, rsRunningNoise, rsHuntingNoise, rsFadeSound, rsRunningNoise, rsHuntingNoise,
dsbHasler, dsbBuzzer, dsbSlipAlarm, m_distancecounterclear, m_rainsound, m_radiostop dsbHasler, dsbBuzzer,dsbBuzzerShp, dsbSlipAlarm, m_distancecounterclear, m_rainsound, m_radiostop
}; };
for (auto &sound : sounds) { for (auto &sound : sounds) {
if (sound.get()) { if (sound.get()) {
@@ -8711,7 +8734,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName)
dsbSwitch, dsbPneumaticSwitch, dsbSwitch, dsbPneumaticSwitch,
rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU, rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU,
rsFadeSound, rsRunningNoise, rsHuntingNoise, rsFadeSound, rsRunningNoise, rsHuntingNoise,
dsbHasler, dsbBuzzer, dsbSlipAlarm, m_distancecounterclear, m_rainsound, m_radiostop dsbHasler, dsbBuzzer, dsbBuzzerShp, dsbSlipAlarm, m_distancecounterclear, m_rainsound, m_radiostop
}; };
for( auto &sound : sounds ) { for( auto &sound : sounds ) {
if( sound.get() ) { if( sound.get() ) {
@@ -9005,6 +9028,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName)
{rsHuntingNoise, caboffset}, {rsHuntingNoise, caboffset},
{dsbHasler, caboffset}, {dsbHasler, caboffset},
{dsbBuzzer, btLampkaCzuwaka.model_offset()}, {dsbBuzzer, btLampkaCzuwaka.model_offset()},
{dsbBuzzerShp, btLampkaCzuwaka.model_offset()},
{dsbSlipAlarm, caboffset}, {dsbSlipAlarm, caboffset},
{m_distancecounterclear, btLampkaCzuwaka.model_offset()}, {m_distancecounterclear, btLampkaCzuwaka.model_offset()},
{m_rainsound, caboffset}, {m_rainsound, caboffset},

2
Train.h
View File

@@ -787,7 +787,7 @@ public: // reszta może by?publiczna
dsbNastawnikJazdy, dsbNastawnikJazdy,
dsbNastawnikBocz, dsbNastawnikBocz,
dsbReverserKey, dsbReverserKey,
dsbBuzzer, dsbBuzzer, dsbBuzzerShp,
m_radiostop, m_radiostop,
dsbSlipAlarm, dsbSlipAlarm,
m_distancecounterclear, m_distancecounterclear,