comparison trunk/src/Modules/Output/FileOutputHTK.cc @ 292:10d0803e37ec

-Added a module to scale output values by the channel centre frequency
-Fixed file input to support loading and processing of multiple files
-Updated the aimc main file to generate profiles like in the recognition experiments

     return false;
   }
   sample_count_ = 0;
   frame_period_ms_ = frame_period_ms;
   header_written_ = false;
+  if (initialized_) {
+    WriteHeader(channel_count_ * buffer_length_, frame_period_ms_);
+  }
   return true;
 }
 
 bool FileOutputHTK::InitializeInternal(const SignalBank &input) {
   if (file_handle_ == NULL) {
     LOG_ERROR(_T("Couldn't initialize file output. "
                  "Please call FileOutputHTK::OpenFile first"));
     return false;
   }
   if (header_written_) {
-    LOG_ERROR(_T("A header has already been written on the output file."
+    LOG_ERROR(_T("A header has already been written on the output file. "
                  "Please call FileOutputHTK::CloseFile to close that file, "
                  "and FileOutputHTK::OpenFile to open an new one before "
                  "calling FileOutputHTK::Initialize again."));
     return false;
   }

 
 void FileOutputHTK::ResetInternal() {
   if (file_handle_ != NULL && !header_written_) {
     WriteHeader(channel_count_ * buffer_length_, frame_period_ms_);
   }
+  if (file_handle_ != NULL)
+    CloseFile();
 }
 
 void FileOutputHTK::WriteHeader(int num_elements, float period_ms) {
   if (header_written_)
     return;

                  "Please call FileOutputHTK::OpenFile first"));
     return;
   }
 
   if (!header_written_) {
-    LOG_ERROR(_T("No header has been written on the output file yet. Please"
+    LOG_ERROR(_T("No header has been written on the output file yet. Please "
                  "call FileOutputHTK::Initialize() before calling "
                  "FileOutputHTK::Process()"));
     return;
   }
   float s;

   fwrite(&samples, sizeof(samples), 1, file_handle_);
 
   // And close the file
   fclose(file_handle_);
   file_handle_ = NULL;
+  header_written_ = false;
   return true;
 }
 
 float FileOutputHTK::ByteSwapFloat(float d) {
   // Endianness fix