1 files changed, 32 insertions, 30 deletions

diff --git a/linden/indra/llaudio/vorbisencode.cpp b/linden/indra/llaudio/vorbisencode.cpp
index c5a751e..7df1416 100644
--- a/linden/indra/llaudio/vorbisencode.cpp
+++ b/linden/indra/llaudio/vorbisencode.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -85,28 +86,29 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro
 
         error_msg.clear();
 
-    apr_file_t* infp = ll_apr_file_open(in_fname,LL_APR_RB);
-        if (!infp)
+        //********************************
+        LLAPRFile infile ;
+    infile.open(in_fname,LL_APR_RB);
+        //********************************
+        if (!infile.getFileHandle())
         {
                 error_msg = "CannotUploadSoundFile";
                 return(LLVORBISENC_SOURCE_OPEN_ERR);
         }
 
-        ll_apr_file_read(infp, wav_header, 44);
-        physical_file_size = ll_apr_file_seek(infp,APR_END,0);
+        infile.read(wav_header, 44);
+        physical_file_size = infile.seek(APR_END,0);
 
         if (strncmp((char *)&(wav_header[0]),"RIFF",4))
         {
                 error_msg = "SoundFileNotRIFF";
-                apr_file_close(infp);
-            return(LLVORBISENC_WAV_FORMAT_ERR);
+                return(LLVORBISENC_WAV_FORMAT_ERR);
         }
 
         if (strncmp((char *)&(wav_header[8]),"WAVE",4))
         {
                 error_msg = "SoundFileNotRIFF";
-                apr_file_close(infp);
-            return(LLVORBISENC_WAV_FORMAT_ERR);
+                return(LLVORBISENC_WAV_FORMAT_ERR);
         }
         
         // parse the chunks
@@ -115,8 +117,8 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro
         
         while ((file_pos + 8)< physical_file_size)
         {
-                ll_apr_file_seek(infp,APR_SET,file_pos);
-                ll_apr_file_read(infp, wav_header, 44);
+                infile.seek(APR_SET,file_pos);
+                infile.read(wav_header, 44);
 
                 chunk_length = ((U32) wav_header[7] << 24) 
                         + ((U32) wav_header[6] << 16) 
@@ -149,8 +151,9 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro
                 file_pos += (chunk_length + 8);
                 chunk_length = 0;
         } 
-
-        apr_file_close(infp);   
+        //****************
+        infile.close();
+        //****************
 
         if (!uncompressed_pcm)
         {       
@@ -228,19 +231,21 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
 
         S32 data_left = 0;
 
-        apr_file_t* infp = ll_apr_file_open(in_fname,LL_APR_RB);
-        if (!infp)
+        LLAPRFile infile ;
+        infile.open(in_fname,LL_APR_RB);
+        if (!infile.getFileHandle())
         {
                 llwarns << "Couldn't open temporary ogg file for writing: " << in_fname
                         << llendl;
                 return(LLVORBISENC_SOURCE_OPEN_ERR);
         }
-        apr_file_t* outfp = ll_apr_file_open(out_fname,LL_APR_WPB);
-        if (!outfp)
+
+        LLAPRFile outfile ;
+        outfile.open(out_fname,LL_APR_WPB);
+        if (!outfile.getFileHandle())
         {
                 llwarns << "Couldn't open upload sound file for reading: " << in_fname
                         << llendl;
-                apr_file_close (infp);
                 return(LLVORBISENC_DEST_OPEN_ERR);
         }
         
@@ -248,10 +253,10 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
          U32 chunk_length = 0;
          U32 file_pos = 12;  // start at the first chunk (usually fmt but not always)
          
-         while (apr_file_eof(infp) != APR_EOF)
+         while (infile.eof() != APR_EOF)
          {
-                 ll_apr_file_seek(infp,APR_SET,file_pos);
-                 ll_apr_file_read(infp, wav_header, 44);
+                 infile.seek(APR_SET,file_pos);
+                 infile.read(wav_header, 44);
                  
                  chunk_length = ((U32) wav_header[7] << 24) 
                          + ((U32) wav_header[6] << 16) 
@@ -271,7 +276,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
                  }
                  else if (!(strncmp((char *)&(wav_header[0]),"data",4)))
                  {
-                         ll_apr_file_seek(infp,APR_SET,file_pos+8);
+                         infile.seek(APR_SET,file_pos+8);
                          // leave the file pointer at the beginning of the data chunk data
                          data_left = chunk_length;                      
                          break;
@@ -280,7 +285,6 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
                  chunk_length = 0;
          } 
          
-//       apr_file_close(infp);  
 
          /********** Encode setup ************/
          
@@ -345,8 +349,8 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
                  while(!eos){
                          int result=ogg_stream_flush(&os,&og);
                          if(result==0)break;
-                         ll_apr_file_write(outfp, og.header, og.header_len);
-                         ll_apr_file_write(outfp, og.body, og.body_len);
+                         outfile.write(og.header, og.header_len);
+                         outfile.write(og.body, og.body_len);
                  }
                  
          }
@@ -356,7 +360,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
          {
                  long bytes_per_sample = bits_per_sample/8;
 
-                 long bytes=(long)ll_apr_file_read(infp, readbuffer,llclamp((S32)(READ_BUFFER*num_channels*bytes_per_sample),0,data_left)); /* stereo hardwired here */
+                 long bytes=(long)infile.read(readbuffer,llclamp((S32)(READ_BUFFER*num_channels*bytes_per_sample),0,data_left)); /* stereo hardwired here */
                  
                  if (bytes==0)
                  {
@@ -464,8 +468,8 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
                                  if(result==0)
                                         break;
 
-                                 ll_apr_file_write(outfp, og.header, og.header_len);
-                                 ll_apr_file_write(outfp, og.body, og.body_len);
+                                 outfile.write(og.header, og.header_len);
+                                 outfile.write(og.body, og.body_len);
                                  
                                  /* this could be set above, but for illustrative purposes, I do
                                         it here (to show that vorbis does know where the stream ends) */
@@ -493,8 +497,6 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
          
 //       fprintf(stderr,"Vorbis encoding: Done.\n");
          llinfos << "Vorbis encoding: Done." << llendl;
-         apr_file_close(outfp);
-         apr_file_close(infp);
          
 #endif
          return(LLVORBISENC_NOERR);