• R/O
  • SSH
  • HTTPS

cadencii: コミット


コミットメタ情報

リビジョン1968 (tree)
日時2012-01-15 08:56:35
作者kbinani

ログメッセージ

[vConnect/trunk/stand2.0] removed: vsqBase

変更サマリ

差分

--- vConnect/trunk/stand2.0/stand/vConnectPhoneme.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vConnectPhoneme.h (revision 1968)
@@ -4,7 +4,6 @@
44 #include <vorbis/vorbisfile.h>
55 #include <fftw3.h>
66 #include <string>
7-#include "vsqMetaText/vsqBase.h"
87 #include "utau/UtauParameter.h"
98
109 using namespace std;
--- vConnect/trunk/stand2.0/stand/vsqMetaText/vsqBase.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/vsqBase.h (nonexistent)
@@ -1,34 +0,0 @@
1-/*
2- *
3- * vsqBase.h
4- * (c) HAL 2010-
5- *
6- * This files is a part of v.Connect.
7- * vsq*.* are codes for vsqMetaText.
8- *
9- * These files are distributed in the hope that it will be useful,
10- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12- *
13- */
14-#ifndef __vsqBase_h__
15-#define __vsqBase_h__
16-
17-#include "../stand.h"
18-#include "../utau/UtauDB.h"
19-
20-#define TICK_PER_BEAT 480
21-#define CONTROL_CURVE_NUM 7
22-#define A4_PITCH 440.0
23-#define A4_NOTE 69
24-
25-/* If __UTAU_OFSET__ is defined, preutterance and voiceoverlap */
26-/* will be treated as offset. So sequence's value will be added */
27-/* by the value in phoneme DataBase. */
28-//#define __UTAU_OFFSET__
29-
30-const string OBJ_NAME_OTOINI = "[oto.ini]";
31-const string OBJ_NAME_EVENT_LIST = "[EventList]";
32-const string OBJ_NAME_TEMPO = "[Tempo]";
33-
34-#endif
--- vConnect/trunk/stand2.0/stand/vsqMetaText/Sequence.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/Sequence.cpp (revision 1968)
@@ -1,7 +1,16 @@
11 /*
22 * Sequence.cpp
3- * Copyright (C) 2009-2011 HAL,
4- * Copyright (C) 2011-2012 kbinani.
3+ * Copyright © 2009-2011 HAL,
4+ * Copyright © 2011-2012 kbinani.
5+ *
6+ * This file is part of vConnect-STAND.
7+ *
8+ * vConnect-STAND is free software; you can redistribute it and/or
9+ * modify it under the terms of the GPL License.
10+ *
11+ * vConnect-STAND is 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.
514 */
615 #include "Sequence.h"
716 #include "../utau/UtauDBManager.h"
@@ -8,6 +17,10 @@
817
918 namespace vconnect
1019 {
20+ const string Sequence::OBJ_NAME_OTOINI = "[oto.ini]";
21+ const string Sequence::OBJ_NAME_EVENT_LIST = "[EventList]";
22+ const string Sequence::OBJ_NAME_TEMPO = "[Tempo]";
23+
1124 void Sequence::setParamOtoIni( string singerName, string otoIniPath, string encoding )
1225 {
1326 // 名前登録して
--- vConnect/trunk/stand2.0/stand/vsqMetaText/Sequence.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/Sequence.h (revision 1968)
@@ -1,12 +1,21 @@
1-/**
1+/*
22 * Sequence.h
3- * Copyright (C) 2009-2011 HAL,
4- * Copyright (C) 2011-2012 kbinani.
3+ * Copyright © 2009-2011 HAL,
4+ * Copyright © 2011-2012 kbinani.
5+ *
6+ * This file is part of vConnect-STAND.
7+ *
8+ * vConnect-STAND is free software; you can redistribute it and/or
9+ * modify it under the terms of the GPL License.
10+ *
11+ * vConnect-STAND is 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.
514 */
615 #ifndef __vsqFileEx_h__
716 #define __vsqFileEx_h__
817
9-#include "vsqBase.h"
18+#include <string>
1019 #include "Event.h"
1120 #include "EventList.h"
1221 #include "BPList.h"
@@ -17,9 +26,12 @@
1726 #include "../Path.h"
1827 #include "../InputStream.h"
1928 #include "../TextInputStream.h"
29+#include "../Map.h"
2030
2131 namespace vconnect
2232 {
33+ using namespace std;
34+
2335 /// <summary>
2436 /// VSQメタテキストが表現するシーケンスを取り扱うクラスです.
2537 /// </summary>
@@ -71,6 +83,33 @@
7183 /// <returns>シーケンスの長さ(tick単位)</returns>
7284 long getEndTick();
7385
86+ /**
87+ * 四分音符一拍あたりの Tick 単位の時間を取得する
88+ * @return Tick 単位の時間
89+ */
90+ static int getTickPerBeat()
91+ {
92+ return 480;
93+ }
94+
95+ /**
96+ * A4 の音の周波数(Hz)を取得する
97+ * @return 周波数(Hz)
98+ */
99+ static double getA4Frequency()
100+ {
101+ return 440.0;
102+ }
103+
104+ /**
105+ * A4 の音のノート番号を取得する
106+ * @return ノート番号
107+ */
108+ static int getA4NoteNumber()
109+ {
110+ return 69;
111+ }
112+
74113 public:
75114
76115 /// <summary>
@@ -132,6 +171,21 @@
132171 */
133172 void setParamOtoIni( string singerName, string otoIniPath, string encoding );
134173
174+ /**
175+ * [oto.ini] セクションの名前
176+ */
177+ static const string OBJ_NAME_OTOINI;
178+
179+ /**
180+ * [EventList] セクションの名前
181+ */
182+ static const string OBJ_NAME_EVENT_LIST;
183+
184+ /**
185+ * [Tempo] セクションの名前
186+ */
187+ static const string OBJ_NAME_TEMPO;
188+
135189 private:
136190
137191 #if defined( _DEBUG )
--- vConnect/trunk/stand2.0/stand/vsqMetaText/vsqTempo.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/vsqTempo.cpp (revision 1968)
@@ -12,7 +12,10 @@
1212 *
1313 */
1414 #include "vsqTempo.h"
15+#include "Sequence.h"
1516
17+using namespace vconnect;
18+
1619 const double vsqTempo::DEFAULT_TEMPO = 120.0;
1720
1821 void vsqTempo::setParameter( string left, string right )
@@ -22,15 +25,11 @@
2225
2326 long vsqTempo::secondToTick( double second )
2427 {
25- /* In This Code, only static tempo is available */
26- long result = (long)( second / 60.0 * tempo * TICK_PER_BEAT );
27-
28- return result;
28+ /* In This Code, only static tempo is available */
29+ return (long)(second / 60.0 * tempo * Sequence::getTickPerBeat());
2930 }
3031
3132 double vsqTempo::tickToSecond( long tick )
3233 {
33- double result = 60.0/tempo*(double)tick/TICK_PER_BEAT;
34-
35- return result;
34+ return 60.0 / tempo * (double)tick / Sequence::getTickPerBeat();
3635 }
--- vConnect/trunk/stand2.0/stand/vsqMetaText/EventList.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/EventList.h (revision 1968)
@@ -6,7 +6,7 @@
66 #ifndef __EventList_h__
77 #define __EventList_h__
88
9-#include "vsqBase.h"
9+#include "../Map.h"
1010 #include "Event.h"
1111
1212 namespace vconnect
--- vConnect/trunk/stand2.0/stand/vsqMetaText/vsqTempo.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/vsqTempo.h (revision 1968)
@@ -14,8 +14,10 @@
1414 #ifndef __vsqTempo_h__
1515 #define __vsqTempo_h__
1616
17-#include "vsqBase.h"
17+#include <string>
1818
19+using namespace std;
20+
1921 class vsqTempo
2022 {
2123
--- vConnect/trunk/stand2.0/stand/vsqMetaText/Event.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vsqMetaText/Event.h (revision 1968)
@@ -15,8 +15,8 @@
1515 #ifndef __Event_h__
1616 #define __Event_h__
1717
18-#include "vsqBase.h"
1918 #include "Handle.h"
19+#include "../utau/UtauParameter.h"
2020
2121 namespace vconnect
2222 {
--- vConnect/trunk/stand2.0/stand/stand.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/stand.cpp (revision 1968)
@@ -14,7 +14,6 @@
1414 #include "stand.h"
1515
1616 #ifdef STND_MULTI_THREAD
17-// あんまり使いたくないグローバル変数.
1817 vconnect::Mutex *hMutex = NULL;
1918 vconnect::Mutex *hFFTWMutex = NULL;
2019 #endif
--- vConnect/trunk/stand2.0/stand/corpusManager.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/corpusManager.h (revision 1968)
@@ -16,6 +16,8 @@
1616 #define __corpusManager_h__
1717
1818 #include <list>
19+#include "stand.h"
20+#include "utau/UtauDB.h"
1921 #include "vConnectSetting.h"
2022 #include "RuntimeOption.h"
2123 #include "vsqMetaText/Sequence.h"
--- vConnect/trunk/stand2.0/stand/Configuration.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/Configuration.h (revision 1968)
@@ -55,6 +55,15 @@
5555 return 2.0;
5656 }
5757
58+ /**
59+ * 音声のデフォルトのサンプリング周波数を取得する
60+ * @return サンプリング周波数(Hz)
61+ */
62+ static int getDefaultSampleRate()
63+ {
64+ return 44100;
65+ }
66+
5867 private:
5968 Configuration()
6069 {
--- vConnect/trunk/stand2.0/stand/Converter.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/Converter.h (revision 1968)
@@ -14,7 +14,6 @@
1414 #ifndef __Converter_h__
1515 #define __Converter_h__
1616
17-#include <math.h>
1817 #include <time.h>
1918 #include "TextInputStream.h"
2019 #include "TextOutputStream.h"
@@ -21,6 +20,7 @@
2120 #include "vConnectPhoneme.h"
2221 #include "StringUtil.h"
2322 #include "Task.h"
23+#include "waveFileEx/waveFileEx.h"
2424
2525 namespace vconnect
2626 {
--- vConnect/trunk/stand2.0/stand/Transcriber.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/Transcriber.cpp (revision 1968)
@@ -13,8 +13,9 @@
1313 */
1414 #include <time.h>
1515
16+#include "utau/UtauDB.h"
17+#include "world/world.h"
1618 #include "Transcriber.h"
17-#include "utau/UtauDB.h"
1819 #include "vConnectPhoneme.h"
1920 #include "vConnectUtility.h"
2021 #include "Configuration.h"
@@ -177,6 +178,7 @@
177178 src->vorbisOpen( &ovf );
178179 float **pcm_channels;
179180
181+ int sampleRate = Configuration::getDefaultSampleRate();
180182 for( int i = 0; i < length; i++ ){
181183 int mel_len;
182184 int c;
@@ -185,7 +187,7 @@
185187
186188 // ケプストラムからパワースペクトルを計算.
187189 mel_cep = src->getMelCepstrum( i, &mel_len );
188- vConnectUtility::extractMelCepstrum( pow_spec, fftl, mel_cep, mel_len, spectrum, out, inverse_c2r, fs );
190+ vConnectUtility::extractMelCepstrum( pow_spec, fftl, mel_cep, mel_len, spectrum, out, inverse_c2r, sampleRate );
189191 getMinimumPhaseSpectrum( pow_spec, spectrum, cepstrum, fftl, forward, inverse );
190192
191193 // Ogg ストリームから残差波形をデコード.
--- vConnect/trunk/stand2.0/stand/vConnectSetting.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vConnectSetting.h (revision 1968)
@@ -14,9 +14,11 @@
1414 #ifndef __vConnectSetting_h__
1515 #define __vConnectSetting_h__
1616
17-#include "vsqMetaText/vsqBase.h"
17+#include <vector>
18+#include <string>
1819 #include "Map.h"
1920
21+using namespace std;
2022 using namespace vconnect;
2123
2224 enum vConnectSettingList{
--- vConnect/trunk/stand2.0/stand/Synthesizer.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/Synthesizer.cpp (revision 1968)
@@ -12,7 +12,9 @@
1212 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1313 */
1414 #include <time.h>
15+#include <math.h>
1516 #include <vorbis/vorbisfile.h>
17+#include "stand.h"
1618 #include "Configuration.h"
1719 #include "Synthesizer.h"
1820 #include "vConnectPhoneme.h"
@@ -21,6 +23,8 @@
2123 #include "Thread.h"
2224 #include "utau/UtauDBManager.h"
2325 #include "vsqMetaText/CurveTypeEnum.h"
26+#include "world/world.h"
27+#include "waveFileEx/waveFileEx.h"
2428
2529 #define TRANS_MAX 4096
2630 double temporary1[TRANS_MAX];
@@ -84,19 +88,18 @@
8488 Synthesizer::Synthesizer( RuntimeOption option )
8589 : Task( option )
8690 {
87- for( int i = 0; i < NOTE_NUM; i++ )
88- {
89- mNoteFrequency[i] = A4_PITCH * pow( 2.0, (double)(i - A4_NOTE) / 12.0 );
91+ double a4frequency = Sequence::getA4Frequency();
92+ int a4note = Sequence::getA4NoteNumber();
93+ for( int i = 0; i < NOTE_NUM; i++ ){
94+ mNoteFrequency[i] = a4frequency * pow( 2.0, (double)(i - a4note) / 12.0 );
9095 }
9196 mVibrato[0] = 0.0;
92- for( int i = 1; i < VIB_NUM; i++ )
93- {
97+ for( int i = 1; i < VIB_NUM; i++ ){
9498 double period = exp( 5.24 - 1.07e-2 * i ) * 2.0 / 1000.0;
9599 mVibrato[i] = 2.0 * ST_PI / period;
96100 }
97101
98- for(int i = 0; i < NOISE_LEN; i++)
99- {
102+ for(int i = 0; i < NOISE_LEN; i++){
100103 noiseWave[i] = randn();
101104 }
102105
@@ -196,7 +199,7 @@
196199 int briVal = briArray[index]; // 現在の bri 値.
197200 int minBri = -1, maxBri = 129;
198201
199- frameIndex = (int)max( 2, min( frameIndex, itemThis->utauSetting.msFixedLength / framePeriod ) );
202+ frameIndex = (int)max( 2.0, min( (double)frameIndex, itemThis->utauSetting.msFixedLength / framePeriod ) );
200203
201204 // 同じフレームを使いまわしたくない場合はここを使うとよい.
202205
@@ -259,7 +262,7 @@
259262 data->phoneme = phoneme;
260263
261264 double baseBriRatio = 1.0 - (double)abs(briVal - p->brightness) / (double)(maxBri - minBri);
262- baseBriRatio = max(0, min(1.0, baseBriRatio));
265+ baseBriRatio = max(0.0, min(1.0, baseBriRatio));
263266 if(baseBriRatio == 0.0)
264267 {
265268 delete data;
@@ -340,13 +343,14 @@
340343 cout << "vConnect::synthesize; calling mVsq.dumpMapIDs...done" << endl;
341344 #endif
342345
343- aperiodicityLength = fftLength = getFFTLengthForStar(fs);
346+ int sampleRate = Configuration::getDefaultSampleRate();
347+ aperiodicityLength = fftLength = getFFTLengthForStar( sampleRate );
344348
345349 // 準備2.合成に必要なローカル変数の初期化
346350 beginFrame = mVsq.events.eventList[0]->beginFrame;
347351 frameLength = mEndFrame - beginFrame;
348352 double framePeriod = Configuration::getMilliSecondsPerFrame();
349- waveLength = (long int)(frameLength * framePeriod * fs / 1000);
353+ waveLength = (long int)(frameLength * framePeriod * sampleRate / 1000);
350354
351355 wave = new double[waveLength];
352356 memset(wave, 0, sizeof(double) * waveLength);
@@ -434,8 +438,8 @@
434438 arg2.dynamics += i;
435439 arg2.f0 += i;
436440 arg2.frames += i;
437- arg2.wave += (int)(currentTime * fs);
438- arg2.waveLength -= (int)(currentTime * fs);
441+ arg2.wave += (int)(currentTime * sampleRate);
442+ arg2.waveLength -= (int)(currentTime * sampleRate);
439443
440444
441445 hThread[0] = new Thread( synthesizeFromList, &arg1 );
@@ -712,6 +716,7 @@
712716
713717 // 合成処理
714718 double framePeriod = Configuration::getMilliSecondsPerFrame();
719+ int sampleRate = Configuration::getDefaultSampleRate();
715720 while( currentFrame < p->endFrame )
716721 {
717722 double currentF0;
@@ -756,7 +761,7 @@
756761 spectrum,
757762 impulse,
758763 inverse_c2r,
759- fs );
764+ sampleRate );
760765 } else {
761766 for(int k = 0; k <= p->fftLength / 2; k++)
762767 {
@@ -764,7 +769,7 @@
764769 }
765770 }
766771 // BRE の値によりノイズを励起信号に加算する.
767- appendNoise( starSpec, (int)min( p->fftLength, T * fs ), (*(p->controlCurves))[CurveTypeEnum::BRETHINESS][breIndex].value / 128.0, &noiseCount );
772+ appendNoise( starSpec, (int)min( p->fftLength, T * sampleRate ), (*(p->controlCurves))[CurveTypeEnum::BRETHINESS][breIndex].value / 128.0, &noiseCount );
768773
769774 // starSpec -> residual DFT を実行する.
770775 fftw_execute(forward_r2c);
@@ -796,7 +801,7 @@
796801
797802 // 実波形に直す.
798803 fftw_execute(inverse_c2r);
799- currentPosition = (int)(currentTime * fs);
804+ currentPosition = (int)(currentTime * sampleRate);
800805 for( int k = 0; k < p->fftLength / 2 && currentPosition < p->waveLength; k++, currentPosition++ )
801806 {
802807 p->wave[currentPosition] += impulse[k] / p->fftLength * p->dynamics[currentFrame];
--- vConnect/trunk/stand2.0/stand/vConnectPhoneme.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vConnectPhoneme.cpp (revision 1968)
@@ -5,6 +5,7 @@
55 #include "world/world.h"
66 #include "waveFileEx/waveFileEx.h"
77 #include "worldParameters.h"
8+#include "Configuration.h"
89
910 vConnectPhoneme::vConnectPhoneme()
1011 {
@@ -398,11 +399,12 @@
398399 // STAR スペクトルを計算する.
399400 // 残差分を作業用バッファとして使いまわし.
400401 double currentF0 = (f0[index] == 0.0)? DEFAULT_F0 : f0[index];
402+ int sampleRate = Configuration::getDefaultSampleRate();
401403 // starGeneralBody(x, xLen, fs, currentF0, timeAxis[i], fftl, specgram[i], waveform, powerSpec, ySpec,&forwardFFT);
402- starGeneralBody(wave, waveLength, fs, currentF0, this->t[index], fftLength, starSpec, waveform, waveform, cepstrum, &forward_r2c);
404+ starGeneralBody(wave, waveLength, sampleRate, currentF0, this->t[index], fftLength, starSpec, waveform, waveform, cepstrum, &forward_r2c);
403405
404406 // PLATINUM 残差スペクトルを計算する.
405- double T0 = (double)fs / currentF0;
407+ double T0 = (double)sampleRate / currentF0;
406408 int wLen = (int)(0.5 + T0*2.0);
407409 int pulseIndex = pulseLocations[index];
408410
@@ -463,7 +465,8 @@
463465 // 事前分析データが無いのであれば事前分析を行いファイルとして保存する.
464466 if(worldParams.readParameters((fileName + ".wpd").c_str()) == false)
465467 {
466- if(worldParams.computeWave(waveBuffer, waveLength, fs, framePeriod))
468+ int sampleRate = Configuration::getDefaultSampleRate();
469+ if(worldParams.computeWave(waveBuffer, waveLength, sampleRate, framePeriod))
467470 {
468471 /* 要らない…?
469472 // 同名ファイルの書き込み中に読み込まれるといけない.
--- vConnect/trunk/stand2.0/stand/corpusManager.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/corpusManager.cpp (revision 1968)
@@ -11,11 +11,11 @@
1111 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1212 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1313 */
14+#include "Configuration.h"
1415 #include "corpusManager.h"
16+#include "vConnectPhoneme.h"
1517 #include "utau/UtauDB.h"
16-#include "vConnectPhoneme.h"
1718 #include "vsqMetaText/Sequence.h"
18-#include "Configuration.h"
1919
2020 using namespace vconnect;
2121
@@ -47,8 +47,14 @@
4747 {
4848 Map<string, phoneme *>::iterator i;
4949 for( i = objectMap.begin(); i != objectMap.end(); i++ ){
50- SAFE_DELETE( i->second->p );
51- SAFE_DELETE( i->second );
50+ if( i->second ){
51+ if( i->second->p ){
52+ delete i->second->p;
53+ i->second->p = NULL;
54+ }
55+ delete i->second;
56+ i->second = NULL;
57+ }
5258 }
5359 for( int j = 0; j < mAppendCorpus.size(); j++){
5460 delete mAppendCorpus[j];
--- vConnect/trunk/stand2.0/stand/vConnectSetting.cpp (revision 1967)
+++ vConnect/trunk/stand2.0/stand/vConnectSetting.cpp (revision 1968)
@@ -11,8 +11,10 @@
1111 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1212 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1313 */
14+#include <cmath>
1415 #include "vConnectSetting.h"
1516 #include "TextInputStream.h"
17+#include "vsqMetaText/Sequence.h"
1618
1719 #define SETTING_BUF_LEN 4096
1820
@@ -34,7 +36,9 @@
3436 brightness = atoi( right.c_str() );
3537 }else if( left.compare( "NoteNumber" ) == 0 ){
3638 noteNumber = atoi( right.c_str() );
37- frequency = A4_PITCH * pow( 2.0, (double)(noteNumber - A4_NOTE) / 12.0 );
39+ double a4frequency = Sequence::getA4Frequency();
40+ int a4note = Sequence::getA4NoteNumber();
41+ frequency = a4frequency * pow( 2.0, (double)(noteNumber - a4note) / 12.0 );
3842 }else if( left.compare( "Directory" ) == 0 ){
3943 path += right;
4044 }else{
@@ -50,8 +54,8 @@
5054 libraryArray[i] = new librarySetting;
5155 libraryArray[i]->brightness = 64;
5256 libraryArray[i]->enabled = false;
53- libraryArray[i]->frequency = A4_PITCH;
54- libraryArray[i]->noteNumber = A4_NOTE;
57+ libraryArray[i]->frequency = Sequence::getA4Frequency();
58+ libraryArray[i]->noteNumber = Sequence::getA4NoteNumber();
5559 libraryArray[i]->path = "";
5660 libraryMap.insert(make_pair(settingName[i], libraryArray[i]));
5761 }
--- vConnect/trunk/stand2.0/stand/stand.h (revision 1967)
+++ vConnect/trunk/stand2.0/stand/stand.h (revision 1968)
@@ -48,97 +48,6 @@
4848 # define STND_OS_OTHER
4949 #endif
5050
51-#if defined( _UNICODE ) || defined( UNICODE )
52-#define USE_WSTRING
53-#endif
54-
55-//Compile-time parameters summary
56-// OS: Windows, MacOSX, openSUSE -> STND_OS_WIN, STND_OS_MAC, STND_OTHER
57-// iconv: used or not used -> MB_USE_ICONV (in mb_text.h)
58-// wcstombs: used or not used -> MB_USE_STDLIB (in mb_text.cpp)
59-// UNICODE: defined or not defined -> USE_WSTRING (just below in this file)
60-//Run-time parameters
61-// Text-encoding: Shift_JIS, UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE
62-
63-//Our code condition in these compile-time parameters
64-// ( These tables were tested with UTF-8. )
65-// ( We should make MORE and MORE tables for Run-time parameters, ooops!! )
66-//(1) In case STND_OS_WIN (VC++)
67-// (1-1) In case MB_USE_ICONV defined
68-//
69-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
70-// -------------------------------------------------------------------------------
71-// UNICODE defined | O.K. | O.K. (*1)
72-// -------------------------------------------------------------------------------
73-// UNICODE not defined | O.K. (*1) | O.K. (*1)
74-//
75-//
76-// (1-2) In case MB_USE_ICONV not defined
77-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
78-// -------------------------------------------------------------------------------
79-// UNICODE defined | O.K. | N.G.
80-// -------------------------------------------------------------------------------
81-// UNICODE not defined | N.G. | N.G.
82-//
83-//
84-//(2) In case STND_OS_WIN && __GNUC__
85-// (2-1) In case MB_USE_ICONV defined
86-//
87-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
88-// -------------------------------------------------------------------------------
89-// UNICODE defined | O.K. | O.K.
90-// -------------------------------------------------------------------------------
91-// UNICODE not defined | O.K. | O.K.
92-//
93-//
94-// (2-2) In case MB_USE_ICONV not defined
95-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
96-// -------------------------------------------------------------------------------
97-// UNICODE defined | N.G. | N.G.
98-// -------------------------------------------------------------------------------
99-// UNICODE not defined | N.G. | N.G.
100-//
101-//
102-//(3) In case STND_OS_MAC
103-// (3-1) In case MB_USE_ICONV defined
104-//
105-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
106-// -------------------------------------------------------------------------------
107-// UNICODE defined | O.K. | O.K.
108-// -------------------------------------------------------------------------------
109-// UNICODE not defined | O.K. | O.K.
110-//
111-//
112-// (3-2) In case MB_USE_ICONV not defined
113-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
114-// -------------------------------------------------------------------------------
115-// UNICODE defined | N.G. (*2) | N.G. (*2)
116-// -------------------------------------------------------------------------------
117-// UNICODE not defined | N.G. (*2) | N.G. (*2)
118-//
119-//
120-//(4) In case STND_OS_OTHER
121-// (4-1) In case MB_USE_ICONV defined
122-//
123-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
124-// -------------------------------------------------------------------------------
125-// UNICODE defined | O.K. | O.K.
126-// -------------------------------------------------------------------------------
127-// UNICODE not defined | O.K. | O.K.
128-//
129-//
130-// (4-2) In case MB_USE_ICONV not defined
131-// | MB_USE_STDLIB defined | MB_USE_STDLIB not defined
132-// -------------------------------------------------------------------------------
133-// UNICODE defined | N.G. (*2) | N.G. (*2)
134-// -------------------------------------------------------------------------------
135-// UNICODE not defined | N.G. (*2) | N.G. (*2)
136-//
137-// *1 patched version only.
138-// http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.1.bin.woe32.zip would not work
139-// *2 libiconv is required in MacOSX and Linux to convert character set.
140-//
141-
14251 #define LINEBUFF_LEN 4096
14352
14453 #ifdef STND_MULTI_THREAD
@@ -151,6 +60,4 @@
15160 #define SAFE_DELETE_ARRAY(x) if(x){ delete[] (x); x = NULL; }
15261 #define SAFE_DELETE(x) if(x){ delete(x); x = NULL; }
15362
154-const int fs = 44100;
155-
15663 #endif
旧リポジトリブラウザで表示