X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Faudioconfig.C;h=33e4ce1977d6904ac5286c4fc54bb9994841de1f;hp=44c5eabe168bf0b1637f6a3760bbd75a49ad62b8;hb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/audioconfig.C b/cinelerra-5.1/cinelerra/audioconfig.C index 44c5eabe..33e4ce19 100644 --- a/cinelerra-5.1/cinelerra/audioconfig.C +++ b/cinelerra-5.1/cinelerra/audioconfig.C @@ -37,6 +37,7 @@ AudioConfig::AudioConfig() oss_in_channels = 2; oss_in_bits = 16; strcpy(esound_in_server, ""); + strpcy(pulse_in_server, ""); esound_in_port = 0; audio_out_driver = AUDIO_ALSA; @@ -44,6 +45,7 @@ AudioConfig::AudioConfig() oss_out_channels = 2; oss_out_bits = 16; strpcy(esound_out_server, ""); + strpcy(pulse_out_server, ""); esound_out_port = 0; audio_duplex_driver = AUDIO_ALSA; @@ -65,6 +67,7 @@ AudioConfig& AudioConfig::operator=(AudioConfig &that) afirewire_in_port = that.afirewire_in_port; afirewire_in_channel = that.afirewire_in_channel; strcpy(esound_in_server, that.esound_in_server); + strcpy(pulse_in_server, that.pulse_in_server); esound_in_port = that.esound_in_port; strcpy(oss_in_device, that.oss_in_device); oss_in_channels = that.oss_in_channels; @@ -74,6 +77,7 @@ AudioConfig& AudioConfig::operator=(AudioConfig &that) audio_out_driver = that.audio_out_driver; strcpy(oss_out_device, that.oss_out_device); strcpy(esound_out_server, that.esound_out_server); + strcpy(pulse_out_server, that.pulse_out_server); esound_out_port = that.esound_out_port; oss_out_channels = that.oss_out_channels; oss_out_bits = that.oss_out_bits; @@ -103,6 +107,8 @@ int AudioConfig::load_defaults(BC_Hash *defaults) oss_in_bits = defaults->get("OSS_IN_BITS", 16); sprintf(esound_in_server, ""); defaults->get("ESOUND_IN_SERVER", esound_in_server); + sprintf(pulse_in_server, ""); + defaults->get("PULSE_IN_SERVER", pulse_in_server); esound_in_port = defaults->get("ESOUND_IN_PORT", 0); audio_out_driver = defaults->get("AUDIO_OUT_DRIVER", AUDIO_ALSA); @@ -113,6 +119,8 @@ int AudioConfig::load_defaults(BC_Hash *defaults) oss_out_bits = defaults->get("OUT_BITS", 16); sprintf(esound_out_server, ""); defaults->get("ESOUND_OUT_SERVER", esound_out_server); + sprintf(pulse_out_server, ""); + defaults->get("PULSE_OUT_SERVER", pulse_out_server); esound_out_port = defaults->get("ESOUND_OUT_PORT", 0); audio_duplex_driver = defaults->get("AUDIO_DUPLEX_DRIVER", AUDIO_ALSA); @@ -135,6 +143,7 @@ int AudioConfig::save_defaults(BC_Hash *defaults) defaults->update("OSS_IN_CHANNELS", oss_in_channels); defaults->update("OSS_IN_BITS", oss_in_bits); defaults->update("ESOUND_IN_SERVER", esound_in_server); + defaults->update("PULSE_IN_SERVER", pulse_in_server); defaults->update("ESOUND_IN_PORT", esound_in_port); defaults->update("AUDIO_OUT_DRIVER", audio_out_driver); @@ -143,6 +152,7 @@ int AudioConfig::save_defaults(BC_Hash *defaults) defaults->update("OUT_CHANNELS", oss_out_channels); defaults->update("OUT_BITS", oss_out_bits); defaults->update("ESOUND_OUT_SERVER", esound_out_server); + defaults->update("PULSE_OUT_SERVER", pulse_out_server); defaults->update("ESOUND_OUT_PORT", esound_out_port); defaults->update("AUDIO_DUPLEX_DRIVER", audio_duplex_driver);