Menu
▾
▴
[SPTK-CVS] SPTK4/src input_source_from_stream.h, 1.1, 1.2 input_source_interface.h, 1.1, 1.2 input_source_interpolation.cc, 1.2, 1.3 input_source_interpolation.h, 1.2, 1.3 input_source_interpolation_with_magic_number.cc, 1.2, 1.3 input_source_interpolation_with_magic_number.h, 1.2, 1.3 input_source_preprocessing_for_filter_gain.h, 1.2, 1.3 input_source_preprocessing_interface.h, 1.1, NONE
|
From: Takenori Y. <tak...@us...> - 2016-10-12 11:13:53
|
Update of /cvsroot/sp-tk/SPTK4/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8591 Modified Files: input_source_from_stream.h input_source_interface.h input_source_interpolation.cc input_source_interpolation.h input_source_interpolation_with_magic_number.cc input_source_interpolation_with_magic_number.h input_source_preprocessing_for_filter_gain.h Removed Files: input_source_preprocessing_interface.h Log Message: remove InputSourcePreprocessingInterface Index: input_source_from_stream.h =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_from_stream.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** input_source_from_stream.h 8 Oct 2016 15:14:59 -0000 1.1 --- input_source_from_stream.h 12 Oct 2016 11:13:51 -0000 1.2 *************** *** 60,69 **** std::istream* input_stream) : zero_padding_(zero_padding), read_size_(read_size), ! input_stream_(input_stream), is_valid_(false) { if (read_size <= 0 || NULL == input_stream) { ! return; } - is_valid_ = true; } --- 60,68 ---- std::istream* input_stream) : zero_padding_(zero_padding), read_size_(read_size), ! input_stream_(input_stream), is_valid_(true) { if (read_size <= 0 || NULL == input_stream) { ! is_valid_ = false; } } *************** *** 72,85 **** // - virtual bool GetZeroPaddingFlag() const { - return zero_padding_; - } - - // - virtual int GetReadSize() const { - return read_size_; - } - - // virtual bool IsValid() const { return is_valid_; --- 71,74 ---- Index: input_source_interpolation.h =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_interpolation.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** input_source_interpolation.h 10 Oct 2016 14:34:04 -0000 1.2 --- input_source_interpolation.h 12 Oct 2016 11:13:51 -0000 1.3 *************** *** 48,52 **** #include <vector> // std::vector ! #include "input_source_preprocessing_interface.h" #include "sptk_utils.h" --- 48,52 ---- #include <vector> // std::vector ! #include "input_source_interface.h" #include "sptk_utils.h" *************** *** 59,63 **** int interpolation_period, bool use_final_frame_for_exceeded_frame, ! InputSourcePreprocessingInterface* source); // --- 59,63 ---- int interpolation_period, bool use_final_frame_for_exceeded_frame, ! InputSourceInterface* source); // *************** *** 113,117 **** // ! InputSourcePreprocessingInterface* source_; // --- 113,117 ---- // ! InputSourceInterface* source_; // Index: input_source_interpolation.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_interpolation.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** input_source_interpolation.cc 10 Oct 2016 14:34:04 -0000 1.2 --- input_source_interpolation.cc 12 Oct 2016 11:13:51 -0000 1.3 *************** *** 55,59 **** int interpolation_period, bool use_final_frame_for_exceeded_frame, ! InputSourcePreprocessingInterface* source) : frame_period_(frame_period), interpolation_period_(interpolation_period), --- 55,59 ---- int interpolation_period, bool use_final_frame_for_exceeded_frame, ! InputSourceInterface* source) : frame_period_(frame_period), interpolation_period_(interpolation_period), Index: input_source_interface.h =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_interface.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** input_source_interface.h 8 Oct 2016 15:14:59 -0000 1.1 --- input_source_interface.h 12 Oct 2016 11:13:51 -0000 1.2 *************** *** 56,65 **** // - virtual bool GetZeroPaddingFlag() const = 0; - - // - virtual int GetReadSize() const = 0; - - // virtual bool IsValid() const = 0; --- 56,59 ---- Index: input_source_preprocessing_for_filter_gain.h =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_preprocessing_for_filter_gain.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** input_source_preprocessing_for_filter_gain.h 11 Oct 2016 06:01:29 -0000 1.2 --- input_source_preprocessing_for_filter_gain.h 12 Oct 2016 11:13:51 -0000 1.3 *************** *** 46,59 **** #define SPTK_SRC_INPUT_SOURCE_PREPROCESSING_FOR_FILTER_GAIN_H_ ! #include <vector> // std::vector #include "input_source_interface.h" - #include "input_source_preprocessing_interface.h" #include "sptk_utils.h" namespace sptk { ! class InputSourcePreprocessingForFilterGain ! : public InputSourcePreprocessingInterface { public: // --- 46,57 ---- #define SPTK_SRC_INPUT_SOURCE_PREPROCESSING_FOR_FILTER_GAIN_H_ ! #include <vector> // std::vector #include "input_source_interface.h" #include "sptk_utils.h" namespace sptk { ! class InputSourcePreprocessingForFilterGain : public InputSourceInterface { public: // *************** *** 66,79 **** // ! InputSourcePreprocessingForFilterGain( ! FilterGainType gain_type, ! InputSourceInterface* source) ! : gain_type_(gain_type), ! source_(source), ! is_valid_(false) { ! if (NULL == source) { return; } - is_valid_ = source_->IsValid(); } --- 64,75 ---- // ! InputSourcePreprocessingForFilterGain(FilterGainType gain_type, ! InputSourceInterface* source) ! : gain_type_(gain_type), source_(source), is_valid_(true) { ! if (NULL == source || ! !source->IsValid()) { ! is_valid_ = false; return; } } Index: input_source_interpolation_with_magic_number.cc =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_interpolation_with_magic_number.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** input_source_interpolation_with_magic_number.cc 12 Oct 2016 04:31:24 -0000 1.2 --- input_source_interpolation_with_magic_number.cc 12 Oct 2016 11:13:51 -0000 1.3 *************** *** 64,68 **** bool use_final_frame_for_exceeded_frame, double magic_number, ! InputSourcePreprocessingInterface* source) : frame_period_(frame_period), interpolation_period_(interpolation_period), --- 64,68 ---- bool use_final_frame_for_exceeded_frame, double magic_number, ! InputSourceInterface* source) : frame_period_(frame_period), interpolation_period_(interpolation_period), --- input_source_preprocessing_interface.h DELETED --- Index: input_source_interpolation_with_magic_number.h =================================================================== RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_interpolation_with_magic_number.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** input_source_interpolation_with_magic_number.h 12 Oct 2016 04:31:24 -0000 1.2 --- input_source_interpolation_with_magic_number.h 12 Oct 2016 11:13:51 -0000 1.3 *************** *** 48,52 **** #include <vector> // std::vector ! #include "input_source_preprocessing_interface.h" #include "sptk_utils.h" --- 48,52 ---- #include <vector> // std::vector ! #include "input_source_interface.h" #include "sptk_utils.h" *************** *** 61,65 **** bool use_final_frame_for_exceeded_frame, double magic_number, ! InputSourcePreprocessingInterface* source); // --- 61,65 ---- bool use_final_frame_for_exceeded_frame, double magic_number, ! InputSourceInterface* source); // *************** *** 123,127 **** // ! InputSourcePreprocessingInterface* source_; // --- 123,127 ---- // ! InputSourceInterface* source_; // |
