# HG changeset patch
# User tomwalters
# Date 1275899901 0
# Node ID 1c072304197168b517a37ce7142affa05c67d346
# Parent  e7bcaf1e87d5d5b592e61c2e9573226cd3b52d50
-Renamed sample_count to frame_count - a more accurate description.

diff -r e7bcaf1e87d5 -r 1c0723041971 trunk/src/Modules/Output/FileOutputAIMC.cc
--- a/trunk/src/Modules/Output/FileOutputAIMC.cc	Mon Jun 07 08:34:49 2010 +0000
+++ b/trunk/src/Modules/Output/FileOutputAIMC.cc	Mon Jun 07 08:38:21 2010 +0000
@@ -67,7 +67,7 @@
     LOG_ERROR(_T("Couldn't open output file '%s' for writing."), filename);
     return false;
   }
-  sample_count_ = 0;
+  frame_count_ = 0;
   frame_period_ms_ = frame_period_ms;
   header_written_ = false;
   if (initialized_) {
@@ -119,13 +119,13 @@
    * f1c1t1,f1c1t2,f1c1t3...
    */
 
-  uint32_t sample_count_out = sample_count_;
+  uint32_t frame_count_out = frame_count_;
   float sample_period_out = frame_period_ms_;
   uint32_t channels_out = channel_count_;
   uint32_t samples_out = buffer_length_;
   float sample_rate = sample_rate_;
 
-  fwrite(&sample_count_out, sizeof(sample_count_out), 1, file_handle_);
+  fwrite(&frame_count_out, sizeof(frame_count_out), 1, file_handle_);
   fwrite(&sample_period_out, sizeof(sample_period_out), 1, file_handle_);
   fwrite(&channels_out, sizeof(channels_out), 1, file_handle_);
   fwrite(&samples_out, sizeof(samples_out), 1, file_handle_);
@@ -156,7 +156,7 @@
       fwrite(&s, sizeof(s), 1, file_handle_);
     }
   }
-  sample_count_++;
+  frame_count_++;
 }
 
 bool FileOutputAIMC::CloseFile() {
@@ -168,8 +168,8 @@
   fflush(file_handle_);
   rewind(file_handle_);
   fflush(file_handle_);
-  uint32_t samples = sample_count_;
-  fwrite(&samples, sizeof(samples), 1, file_handle_);
+  uint32_t frame_count = frame_count_;
+  fwrite(&frame_count, sizeof(frame_count), 1, file_handle_);
 
   // And close the file
   fclose(file_handle_);
diff -r e7bcaf1e87d5 -r 1c0723041971 trunk/src/Modules/Output/FileOutputAIMC.h
--- a/trunk/src/Modules/Output/FileOutputAIMC.h	Mon Jun 07 08:34:49 2010 +0000
+++ b/trunk/src/Modules/Output/FileOutputAIMC.h	Mon Jun 07 08:38:21 2010 +0000
@@ -63,7 +63,7 @@
 
   /*! \brief Count of the number of samples in the file, written on close
    */
-  int sample_count_;
+  int frame_count_;
 
   int channel_count_;
   int buffer_length_;