diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-02 13:48:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-02 13:48:29 -0400 |
| commit | 0ab6eee0996c78d32b722157140cea5a21a5e460 (patch) | |
| tree | 2a0e90651e3cb0e236c9091b33c64d2cb7a616f7 /indra/llaudio/llvorbisencode.cpp | |
| parent | fcc51bd5b01f2a383ad057898484ac9938219b11 (diff) | |
| parent | 8efd992d508eecec42648af4a7bb980fc0cc19cc (diff) | |
merge changes for storm-1027
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
| -rw-r--r-- | indra/llaudio/llvorbisencode.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 0e0c80a456..44eeea0ca4 100644 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -82,8 +82,7 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro error_msg.clear(); //******************************** - LLAPRFile infile ; - infile.open(in_fname,LL_APR_RB); + LLAPRFile infile(in_fname, LL_APR_RB); //******************************** if (!infile.getFileHandle()) { @@ -233,8 +232,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname S32 data_left = 0; - LLAPRFile infile ; - infile.open(in_fname,LL_APR_RB); + LLAPRFile infile(in_fname,LL_APR_RB); if (!infile.getFileHandle()) { llwarns << "Couldn't open temporary ogg file for writing: " << in_fname @@ -242,8 +240,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname return(LLVORBISENC_SOURCE_OPEN_ERR); } - LLAPRFile outfile ; - outfile.open(out_fname,LL_APR_WPB); + LLAPRFile outfile(out_fname, LL_APR_WPB); if (!outfile.getFileHandle()) { llwarns << "Couldn't open upload sound file for reading: " << in_fname |