• R/O
  • SSH
  • HTTPS

cadencii: コミット


コミットメタ情報

リビジョン1962 (tree)
日時2012-01-15 01:14:27
作者kbinani

ログメッセージ

[vConnect/trunk/stand2.0] deleted: utauVoiceDB/utauFreq

変更サマリ

差分

--- vConnect/trunk/stand2.0/stand/Map.h (revision 1961)
+++ vConnect/trunk/stand2.0/stand/Map.h (revision 1962)
@@ -22,18 +22,12 @@
2222
2323 namespace vconnect
2424 {
25-#ifdef __GNUC__
26- using namespace std;
27-#else
28- using namespace stdext;
29-#endif
30-
3125 template<typename K, typename V>
3226 class Map
3327 #ifdef __GNUC__
34- : public map<K, V>
28+ : public std::map<K, V>
3529 #else
36- : public hash_map<K, V>
30+ : public stdext::hash_map<K, V>
3731 #endif
3832 {
3933 };
--- vConnect/trunk/stand2.0/stand/utauVoiceDB/utauFreq.cpp (revision 1961)
+++ vConnect/trunk/stand2.0/stand/utauVoiceDB/utauFreq.cpp (nonexistent)
@@ -1,87 +0,0 @@
1-/*
2- *
3- * utauFreq.cpp
4- * (c) HAL 2010-
5- *
6- * This file is a part of v.Connect.
7- * utauFreq contains UTAU frequency table.
8- * It provides convert function between
9- * WORLD pitch contour and UTAU one.
10- *
11- * These files are distributed in the hope that it will be useful,
12- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14- *
15- */
16-#include "utauFreq.h"
17-#include "../Configuration.h"
18-
19-#define BUFLEN 80
20-
21-using namespace vconnect;
22-
23-bool utauFreq::readFrqFile( string input )
24-{
25- bool ret = false;
26- FILE* fp;
27- char buf[BUFLEN];
28- int numPoints;
29- double f,v;
30-
31- fp = fopen( input.c_str(), "rb" );
32- if( fp ){
33- fread( buf, sizeof(char), 8, fp );
34- buf[8] = '\0';
35- header = buf;
36- fread( (void*)&sampleInterval, sizeof(int), 1, fp );
37- fread( (void*)&averageFrequency, sizeof(double), 1, fp );
38- fread( buf, sizeof(char), 16, fp ); // 空白文字
39- fread( (void*)&numPoints, sizeof(int), 1, fp );
40-
41- f0.resize( numPoints, 0.0 ); volume.resize( numPoints, 0.0 );
42-
43- for( int i = 0; i < numPoints; i++ ){
44- fread( &f, sizeof(double), 1, fp );
45- fread( &v, sizeof(double), 1, fp );
46- f0[i] = f; volume[i] = v;
47- if( f0[i] < 56.0 )
48- f0[i] = 0.0;
49- }
50- fclose( fp );
51- ret = true;
52- }
53-
54- return ret;
55-}
56-
57-void utauFreq::getF0Contour( double* f0, double msLeftBlank, double msRightBlank, int length )
58-{
59-
60- double framePeriod = Configuration::getMilliSecondsPerFrame();
61- double step = (double)fs * framePeriod / 1000.0 / (double)sampleInterval;
62- double x = msLeftBlank / 1000.0 * (double)fs / (double)sampleInterval;
63-
64- for( long i = 0; i < length; i++ ){
65- if( 0 <= x && x < this->f0.size() )
66- f0[i] = this->f0[(long)x];
67- else
68- f0[i] = 0.0;
69- x += step;
70- }
71-}
72-
73-void utauFreq::getDynamics( double* dynamics, double msLeftBlank, double msRightBlank, int length )
74-{
75- double framePeriod = Configuration::getMilliSecondsPerFrame();
76- double step = (double)fs * framePeriod / 1000.0 / (double)sampleInterval;
77- double x = msLeftBlank / 1000.0 * (double)fs / (double)sampleInterval;
78-
79- for( long i = 0; i < length; i++ ){
80- if( 0 <= x && x < volume.size() )
81- dynamics[i] = volume[(long)x];
82- else
83- dynamics[i] = 0.0;
84- x += step;
85- }
86-}
87-
--- vConnect/trunk/stand2.0/stand/utauVoiceDB/utauFreq.h (revision 1961)
+++ vConnect/trunk/stand2.0/stand/utauVoiceDB/utauFreq.h (nonexistent)
@@ -1,35 +0,0 @@
1-/*
2- *
3- * utauFreq.h
4- * (c) HAL 2010-
5- *
6- * This file is a part of v.Connect.
7- * utauFreq contains UTAU frequency table.
8- * It provides convert function between
9- * WORLD pitch contour and UTAU one.
10- *
11- * These files are distributed in the hope that it will be useful,
12- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14- *
15- */
16-#ifndef __utauFreq_h__
17-#define __utauFreq_h__
18-
19-#include "../stand.h"
20-
21-class utauFreq{
22-public:
23- bool readFrqFile( string input );
24- void getF0Contour( double* f0, double msLeftBlank, double msRightBlank, int length );
25- void getDynamics( double* dynamics, double msLeftBlank, double msRightBlank, int length );
26-protected:
27- vector<double> f0;
28- vector<double> volume;
29- int sampleInterval;
30- double averageFrequency;
31- string header;
32-};
33-
34-
35-#endif
旧リポジトリブラウザで表示